@@ -173,9 +173,7 @@ def _set_grouper(self, obj: FrameOrSeries, sort: bool = False):
173
173
ax = self ._grouper .take (obj .index )
174
174
else :
175
175
if key not in obj ._info_axis :
176
- raise KeyError (
177
- "The grouper name {key} is not found" .format (key = key )
178
- )
176
+ raise KeyError (f"The grouper name { key } is not found" )
179
177
ax = Index (obj [key ], name = key )
180
178
181
179
else :
@@ -191,9 +189,7 @@ def _set_grouper(self, obj: FrameOrSeries, sort: bool = False):
191
189
192
190
else :
193
191
if level not in (0 , ax .name ):
194
- raise ValueError (
195
- "The level {level} is not valid" .format (level = level )
196
- )
192
+ raise ValueError (f"The level { level } is not valid" )
197
193
198
194
# possibly sort
199
195
if (self .sort or sort ) and not ax .is_monotonic :
@@ -212,13 +208,13 @@ def groups(self):
212
208
213
209
def __repr__ (self ) -> str :
214
210
attrs_list = (
215
- "{name }={val!r}" . format ( name = attr_name , val = getattr (self , attr_name ))
211
+ f" { attr_name } ={ getattr (self , attr_name )!r } "
216
212
for attr_name in self ._attributes
217
213
if getattr (self , attr_name ) is not None
218
214
)
219
215
attrs = ", " .join (attrs_list )
220
216
cls_name = self .__class__ .__name__
221
- return "{cls }({attrs})". format ( cls = cls_name , attrs = attrs )
217
+ return f" { cls_name } ({ attrs } )"
222
218
223
219
224
220
class Grouping :
@@ -280,9 +276,7 @@ def __init__(
280
276
if level is not None :
281
277
if not isinstance (level , int ):
282
278
if level not in index .names :
283
- raise AssertionError (
284
- "Level {level} not in index" .format (level = level )
285
- )
279
+ raise AssertionError (f"Level { level } not in index" )
286
280
level = index .names .index (level )
287
281
288
282
if self .name is None :
@@ -350,17 +344,16 @@ def __init__(
350
344
):
351
345
if getattr (self .grouper , "ndim" , 1 ) != 1 :
352
346
t = self .name or str (type (self .grouper ))
353
- raise ValueError ("Grouper for '{t}' not 1-dimensional" . format ( t = t ) )
347
+ raise ValueError (f "Grouper for '{ t } ' not 1-dimensional" )
354
348
self .grouper = self .index .map (self .grouper )
355
349
if not (
356
350
hasattr (self .grouper , "__len__" )
357
351
and len (self .grouper ) == len (self .index )
358
352
):
353
+ grper = pprint_thing (self .grouper )
359
354
errmsg = (
360
355
"Grouper result violates len(labels) == "
361
- "len(data)\n result: {grper}" .format (
362
- grper = pprint_thing (self .grouper )
363
- )
356
+ f"len(data)\n result: { grper } "
364
357
)
365
358
self .grouper = None # Try for sanity
366
359
raise AssertionError (errmsg )
@@ -375,7 +368,7 @@ def __init__(
375
368
self .grouper = self .grouper .astype ("timedelta64[ns]" )
376
369
377
370
def __repr__ (self ) -> str :
378
- return "Grouping({name})" . format ( name = self .name )
371
+ return f "Grouping({ self .name } )"
379
372
380
373
def __iter__ (self ):
381
374
return iter (self .indices )
@@ -500,11 +493,7 @@ def get_grouper(
500
493
501
494
if isinstance (level , str ):
502
495
if obj .index .name != level :
503
- raise ValueError (
504
- "level name {level} is not the name of the index" .format (
505
- level = level
506
- )
507
- )
496
+ raise ValueError (f"level name { level } is not the name of the index" )
508
497
elif level > 0 or level < - 1 :
509
498
raise ValueError ("level > 0 or level < -1 only valid with MultiIndex" )
510
499
@@ -636,12 +625,8 @@ def is_in_obj(gpr) -> bool:
636
625
637
626
if is_categorical_dtype (gpr ) and len (gpr ) != obj .shape [axis ]:
638
627
raise ValueError (
639
- (
640
- "Length of grouper ({len_gpr}) and axis ({len_axis})"
641
- " must be same length" .format (
642
- len_gpr = len (gpr ), len_axis = obj .shape [axis ]
643
- )
644
- )
628
+ f"Length of grouper ({ len (gpr )} ) and axis ({ obj .shape [axis ]} )"
629
+ " must be same length"
645
630
)
646
631
647
632
# create the Grouping
0 commit comments