Merge remote-tracking branch 'upstream/master' into issue-26023

Author: drew-heenan

mypy.ini

@@ -170,15 +170,6 @@ ignore_errors=True
 [mypy-pandas.plotting._core]
 ignore_errors=True
 
-[mypy-pandas.tseries.frequencies]
-ignore_errors=True
-
-[mypy-pandas.tseries.holiday]
-ignore_errors=True
-
-[mypy-pandas.tseries.offsets]
-ignore_errors=True
-
 [mypy-pandas.util._doctools]
 ignore_errors=True
 

pandas/compat/__init__.py

@@ -24,8 +24,6 @@
 import platform
 import types
 import struct
-import inspect
-from collections import namedtuple
 
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] >= 3
@@ -64,32 +62,6 @@ def str_to_bytes(s, encoding=None):
     def bytes_to_str(b, encoding=None):
         return b.decode(encoding or 'utf-8')
 
-    # The signature version below is directly copied from Django,
-    # https://github.com/django/django/pull/4846
-    def signature(f):
-        sig = inspect.signature(f)
-        args = [
-            p.name for p in sig.parameters.values()
-            if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
-        ]
-        varargs = [
-            p.name for p in sig.parameters.values()
-            if p.kind == inspect.Parameter.VAR_POSITIONAL
-        ]
-        varargs = varargs[0] if varargs else None
-        keywords = [
-            p.name for p in sig.parameters.values()
-            if p.kind == inspect.Parameter.VAR_KEYWORD
-        ]
-        keywords = keywords[0] if keywords else None
-        defaults = [
-            p.default for p in sig.parameters.values()
-            if p.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
-            and p.default is not p.empty
-        ] or None
-        argspec = namedtuple('Signature', ['args', 'defaults',
-                                           'varargs', 'keywords'])
-        return argspec(args, defaults, varargs, keywords)
 else:
     # Python 2
     _name_re = re.compile(r"[a-zA-Z_][a-zA-Z0-9_]*$")
@@ -103,9 +75,6 @@ def str_to_bytes(s, encoding='ascii'):
     def bytes_to_str(b, encoding='ascii'):
         return b
 
-    def signature(f):
-        return inspect.getargspec(f)
-
 if PY2:
     def iteritems(obj, **kw):
         return obj.iteritems(**kw)

pandas/core/apply.py

@@ -1,9 +1,9 @@
+import inspect
 import warnings
 
 import numpy as np
 
 from pandas._libs import reduction
-import pandas.compat as compat
 from pandas.util._decorators import cache_readonly
 
 from pandas.core.dtypes.common import (
@@ -123,7 +123,7 @@ def get_result(self):
             # Some methods (shift, etc.) require the axis argument, others
             # don't, so inspect and insert if necessary.
             func = getattr(self.obj, self.f)
-            sig = compat.signature(func)
+            sig = inspect.getfullargspec(func)
             if 'axis' in sig.args:
                 self.kwds['axis'] = self.axis
             return func(*self.args, **self.kwds)

pandas/core/generic.py

@@ -8781,22 +8781,22 @@ def _where(self, cond, other=np.nan, inplace=False, axis=None, level=None,
             .. versionadded:: 0.18.1
                 A callable can be used as other.
 
-        inplace : boolean, default False
+        inplace : bool, default False
             Whether to perform the operation in place on the data.
         axis : int, default None
             Alignment axis if needed.
         level : int, default None
             Alignment level if needed.
-        errors : str, {'raise', 'ignore'}, default `raise`
+        errors : str, {'raise', 'ignore'}, default 'raise'
             Note that currently this parameter won't affect
             the results and will always coerce to a suitable dtype.
 
-            - `raise` : allow exceptions to be raised.
-            - `ignore` : suppress exceptions. On error return original object.
+            - 'raise' : allow exceptions to be raised.
+            - 'ignore' : suppress exceptions. On error return original object.
 
-        try_cast : boolean, default False
+        try_cast : bool, default False
             Try to cast the result back to the input type (if possible).
-        raise_on_error : boolean, default True
+        raise_on_error : bool, default True
             Whether to raise on invalid data types (e.g. trying to where on
             strings).
 
@@ -8806,7 +8806,7 @@ def _where(self, cond, other=np.nan, inplace=False, axis=None, level=None,
 
         Returns
         -------
-        wh : same type as caller
+        Same type as caller
 
         See Also
         --------
@@ -8855,6 +8855,13 @@ def _where(self, cond, other=np.nan, inplace=False, axis=None, level=None,
         dtype: int64
 
         >>> df = pd.DataFrame(np.arange(10).reshape(-1, 2), columns=['A', 'B'])
+        >>> df
+           A  B
+        0  0  1
+        1  2  3
+        2  4  5
+        3  6  7
+        4  8  9
         >>> m = df %% 3 == 0
         >>> df.where(m, -df)
            A  B

pandas/tests/reductions/test_stat_reductions.py

@@ -2,6 +2,7 @@
 """
 Tests for statistical reductions of 2nd moment or higher: var, skew, kurt, ...
 """
+import inspect
 
 import numpy as np
 import pytest
@@ -10,7 +11,7 @@
 import pandas.util._test_decorators as td
 
 import pandas as pd
-from pandas import DataFrame, Series, compat
+from pandas import DataFrame, Series
 import pandas.util.testing as tm
 
 
@@ -75,7 +76,7 @@ def _check_stat_op(self, name, alternate, string_series_,
                 f(string_series_, axis=1)
 
             # Unimplemented numeric_only parameter.
-            if 'numeric_only' in compat.signature(f).args:
+            if 'numeric_only' in inspect.getfullargspec(f).args:
                 with pytest.raises(NotImplementedError, match=name):
                     f(string_series_, numeric_only=True)
 

pandas/tseries/frequencies.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from datetime import timedelta
 import re
+from typing import Dict
 
 import numpy as np
 from pytz import AmbiguousTimeError
@@ -37,7 +38,7 @@
 # Offset names ("time rules") and related functions
 
 #: cache of previously seen offsets
-_offset_map = {}
+_offset_map = {}  # type: Dict[str, DateOffset]
 
 
 def get_period_alias(offset_str):

pandas/tseries/holiday.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+from typing import List
 import warnings
 
 from dateutil.relativedelta import FR, MO, SA, SU, TH, TU, WE  # noqa
@@ -329,7 +330,7 @@ class AbstractHolidayCalendar(object):
     Abstract interface to create holidays following certain rules.
     """
     __metaclass__ = HolidayCalendarMetaClass
-    rules = []
+    rules = []  # type: List[Holiday]
     start_date = Timestamp(datetime(1970, 1, 1))
     end_date = Timestamp(datetime(2030, 12, 31))
     _cache = None

pandas/tseries/offsets.py

@@ -2,6 +2,7 @@
 from datetime import date, datetime, timedelta
 import functools
 import operator
+from typing import Optional
 
 from dateutil.easter import easter
 import numpy as np
@@ -1582,8 +1583,8 @@ class QuarterOffset(DateOffset):
     """
     Quarter representation - doesn't call super.
     """
-    _default_startingMonth = None
-    _from_name_startingMonth = None
+    _default_startingMonth = None  # type: Optional[int]
+    _from_name_startingMonth = None   # type: Optional[int]
     _adjust_dst = True
     _attributes = frozenset(['n', 'normalize', 'startingMonth'])
     # TODO: Consider combining QuarterOffset and YearOffset __init__ at some

pandas/util/_decorators.py

@@ -4,7 +4,6 @@
 import warnings
 
 from pandas._libs.properties import cache_readonly  # noqa
-from pandas.compat import signature
 
 
 def deprecate(name, alternative, version, alt_name=None,
@@ -335,7 +334,7 @@ def make_signature(func):
     (['a', 'b', 'c=2'], ['a', 'b', 'c'])
     """
 
-    spec = signature(func)
+    spec = inspect.getfullargspec(func)
     if spec.defaults is None:
         n_wo_defaults = len(spec.args)
         defaults = ('',) * n_wo_defaults
@@ -347,6 +346,6 @@ def make_signature(func):
         args.append(var if default == '' else var + '=' + repr(default))
     if spec.varargs:
         args.append('*' + spec.varargs)
-    if spec.keywords:
-        args.append('**' + spec.keywords)
+    if spec.varkw:
+        args.append('**' + spec.varkw)
     return args, spec.args

scripts/validate_docstrings.py

@@ -50,7 +50,6 @@
 
 sys.path.insert(0, os.path.join(BASE_PATH))
 import pandas
-from pandas.compat import signature
 
 sys.path.insert(1, os.path.join(BASE_PATH, 'doc', 'sphinxext'))
 from numpydoc.docscrape import NumpyDocString
@@ -420,16 +419,16 @@ def signature_parameters(self):
                 # accessor classes have a signature but don't want to show this
                 return tuple()
         try:
-            sig = signature(self.obj)
+            sig = inspect.getfullargspec(self.obj)
         except (TypeError, ValueError):
             # Some objects, mainly in C extensions do not support introspection
             # of the signature
             return tuple()
         params = sig.args
         if sig.varargs:
             params.append("*" + sig.varargs)
-        if sig.keywords:
-            params.append("**" + sig.keywords)
+        if sig.varkw:
+            params.append("**" + sig.varkw)
         params = tuple(params)
         if params and params[0] in ('self', 'cls'):
             return params[1:]