@@ -5986,13 +5986,44 @@ def test_groupby_whitelist(self):
5986
5986
# 'nlargest', 'nsmallest',
5987
5987
])
5988
5988
5989
+ # TODO: Fix these inconsistencies between attribute and method names
5990
+ inconsistently_named = frozenset ([
5991
+ 'tshift' ,
5992
+ 'any' ,
5993
+ 'dtypes' ,
5994
+ 'idxmax' ,
5995
+ 'all' ,
5996
+ 'fillna' ,
5997
+ 'rank' ,
5998
+ 'quantile' ,
5999
+ 'cummax' ,
6000
+ 'take' ,
6001
+ 'corr' ,
6002
+ 'cummin' ,
6003
+ 'diff' ,
6004
+ 'plot' ,
6005
+ 'pct_change' ,
6006
+ 'skew' ,
6007
+ 'hist' ,
6008
+ 'bfill' ,
6009
+ 'cov' ,
6010
+ 'boxplot' ,
6011
+ 'describe' ,
6012
+ 'corrwith' ,
6013
+ 'idxmin' ,
6014
+ 'ffill' ,
6015
+ 'mad' ,
6016
+ 'dtype' ,
6017
+ 'unique'
6018
+ ])
6019
+
5989
6020
for obj , whitelist in zip ((df , s ), (df_whitelist , s_whitelist )):
5990
6021
gb = obj .groupby (df .letters )
5991
6022
self .assertEqual (whitelist , gb ._apply_whitelist )
5992
6023
for m in whitelist :
5993
6024
f = getattr (type (gb ), m )
5994
- # TODO: Fix inconsistencies between attribute and method names
5995
- # self.assertEqual(f.__name__, m)
6025
+ if m not in inconsistently_named :
6026
+ self .assertEqual (f .__name__ , m )
5996
6027
5997
6028
AGG_FUNCTIONS = ['sum' , 'prod' , 'min' , 'max' , 'median' , 'mean' , 'skew' ,
5998
6029
'mad' , 'std' , 'var' , 'sem' ]
@@ -6095,12 +6126,6 @@ def test_tab_completion(self):
6095
6126
'ffill' , 'bfill' , 'pad' , 'backfill' , 'rolling' , 'expanding' ])
6096
6127
self .assertEqual (results , expected )
6097
6128
6098
- def test_groupby_function_rename (self ):
6099
- grp = self .mframe .groupby (level = 'second' )
6100
- for name in ['sum' , 'prod' , 'min' , 'max' , 'first' , 'last' ]:
6101
- f = getattr (grp , name )
6102
- self .assertEqual (f .__name__ , name )
6103
-
6104
6129
def test_lexsort_indexer (self ):
6105
6130
keys = [[nan ] * 5 + list (range (100 )) + [nan ] * 5 ]
6106
6131
# orders=True, na_position='last'
0 commit comments