Changed _attributes to use signature + changed tests to have ordered arguments for TimeGrouper

Author: tp

pandas/core/groupby.py

@@ -9,7 +9,7 @@
 
 from pandas.compat import (
     zip, range, lzip,
-    callable, map
+    callable, map, signature
 )
 
 from pandas import compat
@@ -233,10 +233,6 @@ class Grouper(object):
 
     >>> df.groupby(Grouper(level='date', freq='60s', axis=1))
     """
-    _attributes = collections.OrderedDict((('key', None), ('level', None),
-                                           ('freq', None), ('axis', 0),
-                                           ('sort', False)
-                                           ))
 
     def __new__(cls, *args, **kwargs):
         if kwargs.get('freq') is not None:
@@ -256,6 +252,11 @@ def __init__(self, key=None, level=None, freq=None, axis=0, sort=False):
         self.indexer = None
         self.binner = None
 
+    # _attributes is used in __repr__below
+    _attributes = collections.OrderedDict(
+        (k, v) for k, v in zip(signature(__init__).args[1:],
+                               signature(__init__).defaults))
+
     @property
     def ax(self):
         return self.grouper
@@ -338,9 +339,9 @@ def groups(self):
         return self.grouper.groups
 
     def __repr__(self):
-        defaults = self._attributes
         sd = self.__dict__
-        attrs = collections.OrderedDict((k, sd[k]) for k, v in defaults.items()
+        attr = self._attributes
+        attrs = collections.OrderedDict((k, sd[k]) for k, v in attr.items()
                                         if k in sd and sd[k] != v)
         attrs = ", ".join("{}={!r}".format(k, v) for k, v in attrs.items())
         cls_name = self.__class__.__name__

pandas/core/resample.py

@@ -1026,16 +1026,6 @@ class TimeGrouper(Grouper):
     Use begin, end, nperiods to generate intervals that cannot be derived
     directly from the associated object
     """
-    # _attributes is used in __repr__below
-    _attributes = Grouper._attributes.copy()
-    _attributes.update((('freq', 'Min'), ('closed', None), ('label', None),
-                        ('how', 'mean'), ('nperiods', None), ('axis', 0),
-                        ('fill_method', None), ('limit', None),
-                        ('loffset', None), ('kind', None),
-                        ('convention', None), ('base', 0),
-                        ('convention', 'e'), ('sort', True),
-                        ))
-    _end_types = {'M', 'A', 'Q', 'BM', 'BA', 'BQ', 'W'}
 
     def __init__(self, freq='Min', closed=None, label=None, how='mean',
                  nperiods=None, axis=0,
@@ -1080,6 +1070,14 @@ def __init__(self, freq='Min', closed=None, label=None, how='mean',
 
         super(TimeGrouper, self).__init__(freq=freq, axis=axis, **kwargs)
 
+    # _attributes is used in __repr__below
+    _attributes = Grouper._attributes.copy()
+    _attributes.update(
+        (k, v) for k, v in zip(compat.signature(__init__).args[1:],
+                               compat.signature(__init__).defaults))
+    _attributes.update(sort=True, convention='e')
+    _end_types = {'M', 'A', 'Q', 'BM', 'BA', 'BQ', 'W'}
+
     def _get_resampler(self, obj, kind=None):
         """
         return my resampler or raise if we have an invalid axis

pandas/tests/test_resample.py

@@ -3180,10 +3180,8 @@ def setup_method(self, method):
     def test_timegrouper_repr(self):
         # Added in GH17727
         result = repr(TimeGrouper(key='key', freq='50Min', label='right'))
-        cls_name_result, attrib_result = result.split('(')
-        attrib_result = set(attrib_result.rstrip(')').split(', '))
-        assert cls_name_result == 'TimeGrouper'
-        assert attrib_result == {"key='key'", "freq='50T'", "label='right'"}
+        expected = "TimeGrouper(key='key', freq='50T', label='right')"
+        assert result == expected
 
     def test_apply(self):
         with tm.assert_produces_warning(FutureWarning,