@@ -174,7 +174,7 @@ def _set_grouper(self, obj: FrameOrSeries, sort: bool = False):
174
174
else :
175
175
if key not in obj ._info_axis :
176
176
raise KeyError (
177
- "The grouper name {key} is not found" . format ( key = key )
177
+ f "The grouper name { key } is not found"
178
178
)
179
179
ax = Index (obj [key ], name = key )
180
180
@@ -192,7 +192,7 @@ def _set_grouper(self, obj: FrameOrSeries, sort: bool = False):
192
192
else :
193
193
if level not in (0 , ax .name ):
194
194
raise ValueError (
195
- "The level {level} is not valid" . format ( level = level )
195
+ f "The level { level } is not valid"
196
196
)
197
197
198
198
# possibly sort
@@ -212,13 +212,13 @@ def groups(self):
212
212
213
213
def __repr__ (self ) -> str :
214
214
attrs_list = (
215
- "{name }={val!r}" . format ( name = attr_name , val = getattr (self , attr_name ))
215
+ f" { attr_name } ={ getattr (self , attr_name )!r } "
216
216
for attr_name in self ._attributes
217
217
if getattr (self , attr_name ) is not None
218
218
)
219
219
attrs = ", " .join (attrs_list )
220
220
cls_name = self .__class__ .__name__
221
- return "{cls }({attrs})". format ( cls = cls_name , attrs = attrs )
221
+ return f" { cls_name } ({ attrs } )"
222
222
223
223
224
224
class Grouping :
@@ -281,7 +281,7 @@ def __init__(
281
281
if not isinstance (level , int ):
282
282
if level not in index .names :
283
283
raise AssertionError (
284
- "Level {level} not in index" . format ( level = level )
284
+ f "Level { level } not in index"
285
285
)
286
286
level = index .names .index (level )
287
287
@@ -350,17 +350,15 @@ def __init__(
350
350
):
351
351
if getattr (self .grouper , "ndim" , 1 ) != 1 :
352
352
t = self .name or str (type (self .grouper ))
353
- raise ValueError ("Grouper for '{t}' not 1-dimensional" . format ( t = t ) )
353
+ raise ValueError (f "Grouper for '{ t } ' not 1-dimensional" )
354
354
self .grouper = self .index .map (self .grouper )
355
355
if not (
356
356
hasattr (self .grouper , "__len__" )
357
357
and len (self .grouper ) == len (self .index )
358
358
):
359
359
errmsg = (
360
360
"Grouper result violates len(labels) == "
361
- "len(data)\n result: {grper}" .format (
362
- grper = pprint_thing (self .grouper )
363
- )
361
+ f"len(data)\n result: { pprint_thing (self .grouper )} "
364
362
)
365
363
self .grouper = None # Try for sanity
366
364
raise AssertionError (errmsg )
@@ -375,7 +373,7 @@ def __init__(
375
373
self .grouper = self .grouper .astype ("timedelta64[ns]" )
376
374
377
375
def __repr__ (self ) -> str :
378
- return "Grouping({name})" . format ( name = self .name )
376
+ return f "Grouping({ self .name } )"
379
377
380
378
def __iter__ (self ):
381
379
return iter (self .indices )
@@ -501,9 +499,7 @@ def get_grouper(
501
499
if isinstance (level , str ):
502
500
if obj .index .name != level :
503
501
raise ValueError (
504
- "level name {level} is not the name of the index" .format (
505
- level = level
506
- )
502
+ f"level name { level } is not the name of the index"
507
503
)
508
504
elif level > 0 or level < - 1 :
509
505
raise ValueError ("level > 0 or level < -1 only valid with MultiIndex" )
@@ -636,12 +632,8 @@ def is_in_obj(gpr) -> bool:
636
632
637
633
if is_categorical_dtype (gpr ) and len (gpr ) != obj .shape [axis ]:
638
634
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
- )
635
+ f"Length of grouper ({ len (gpr )} ) and axis ({ obj .shape [axis ]} )"
636
+ " must be same length"
645
637
)
646
638
647
639
# create the Grouping
0 commit comments