Merge remote-tracking branch 'upstream/master' into post_numpy_bump

Author: h-vetinari

pandas/api/extensions/__init__.py

@@ -1,4 +1,4 @@
-"""Public API for extending panadas objects."""
+"""Public API for extending pandas objects."""
 from pandas.core.accessor import (register_dataframe_accessor,  # noqa
                                   register_index_accessor,
                                   register_series_accessor)

pandas/util/_decorators.py

@@ -314,14 +314,15 @@ def indent(text, indents=1):
 
 def make_signature(func):
     """
-    Returns a string repr of the arg list of a func call, with any defaults.
+    Returns a tuple containing the paramenter list with defaults
+    and parameter list.
 
     Examples
     --------
-    >>> def f(a,b,c=2) :
-    >>>     return a*b*c
-    >>> print(_make_signature(f))
-    a,b,c=2
+    >>> def f(a, b, c=2):
+    >>>     return a * b * c
+    >>> print(make_signature(f))
+    (['a', 'b', 'c=2'], ['a', 'b', 'c'])
     """
 
     spec = signature(func)
@@ -332,7 +333,7 @@ def make_signature(func):
         n_wo_defaults = len(spec.args) - len(spec.defaults)
         defaults = ('',) * n_wo_defaults + tuple(spec.defaults)
     args = []
-    for i, (var, default) in enumerate(zip(spec.args, defaults)):
+    for var, default in zip(spec.args, defaults):
         args.append(var if default == '' else var + '=' + repr(default))
     if spec.varargs:
         args.append('*' + spec.varargs)