@@ -5213,13 +5213,44 @@ def test_groupby_whitelist(self):
5213
5213
# 'nlargest', 'nsmallest',
5214
5214
])
5215
5215
5216
+ # TODO: Fix these inconsistencies between attribute and method names
5217
+ inconsistently_named = frozenset ([
5218
+ 'tshift' ,
5219
+ 'any' ,
5220
+ 'dtypes' ,
5221
+ 'idxmax' ,
5222
+ 'all' ,
5223
+ 'fillna' ,
5224
+ 'rank' ,
5225
+ 'quantile' ,
5226
+ 'cummax' ,
5227
+ 'take' ,
5228
+ 'corr' ,
5229
+ 'cummin' ,
5230
+ 'diff' ,
5231
+ 'plot' ,
5232
+ 'pct_change' ,
5233
+ 'skew' ,
5234
+ 'hist' ,
5235
+ 'bfill' ,
5236
+ 'cov' ,
5237
+ 'boxplot' ,
5238
+ 'describe' ,
5239
+ 'corrwith' ,
5240
+ 'idxmin' ,
5241
+ 'ffill' ,
5242
+ 'mad' ,
5243
+ 'dtype' ,
5244
+ 'unique'
5245
+ ])
5246
+
5216
5247
for obj , whitelist in zip ((df , s ), (df_whitelist , s_whitelist )):
5217
5248
gb = obj .groupby (df .letters )
5218
5249
self .assertEqual (whitelist , gb ._apply_whitelist )
5219
5250
for m in whitelist :
5220
5251
f = getattr (type (gb ), m )
5221
- # TODO: Fix inconsistencies between attribute and method names
5222
- # self.assertEqual(f.__name__, m)
5252
+ if m not in inconsistently_named :
5253
+ self .assertEqual (f .__name__ , m )
5223
5254
5224
5255
AGG_FUNCTIONS = ['sum' , 'prod' , 'min' , 'max' , 'median' , 'mean' , 'skew' ,
5225
5256
'mad' , 'std' , 'var' , 'sem' ]
@@ -5322,12 +5353,6 @@ def test_tab_completion(self):
5322
5353
'ffill' , 'bfill' , 'pad' , 'backfill' , 'rolling' , 'expanding' ])
5323
5354
self .assertEqual (results , expected )
5324
5355
5325
- def test_groupby_function_rename (self ):
5326
- grp = self .mframe .groupby (level = 'second' )
5327
- for name in ['sum' , 'prod' , 'min' , 'max' , 'first' , 'last' ]:
5328
- f = getattr (grp , name )
5329
- self .assertEqual (f .__name__ , name )
5330
-
5331
5356
def test_lexsort_indexer (self ):
5332
5357
keys = [[nan ] * 5 + list (range (100 )) + [nan ] * 5 ]
5333
5358
# orders=True, na_position='last'
0 commit comments