FIX: Fixes after rebase

Author: larsoner

numpydoc/docscrape_sphinx.py

@@ -82,14 +82,15 @@ def _str_returns(self, name='Returns'):
             out += self._str_field_list(name)
             out += ['']
             for param in self[name]:
-                if param.type:
+                param_type = param.type
+                if param_type:
                     if self.xref_param_type:
-                        param.type = make_xref_param_type(
-                            param.type,
+                        param_type = make_xref_param_type(
+                            param_type,
                             self.xref_aliases,
                             self.xref_ignore)
-                    out += self._str_indent([typed_fmt % (param.strip(),
-                                                          param.type)])
+                    out += self._str_indent([typed_fmt % (param.name.strip(),
+                                                          param_type)])
                 else:
                     out += self._str_indent([untyped_fmt % param.name.strip()])
                 if not param.desc:
@@ -219,13 +220,14 @@ def _str_param_list(self, name, fake_autosummary=False):
                                                           fake_autosummary)
 
                 if param.type:
+                    param_type = param.type
                     if self.xref_param_type:
                         param_type = make_xref_param_type(
                             param_type,
                             self.xref_aliases,
                             self.xref_ignore)
                     out += self._str_indent(['%s : %s' % (display_param,
-                                                          param.type)])
+                                                          param_type)])
                 else:
                     out += self._str_indent([display_param])
                 if desc and self.use_blockquotes: