@@ -188,8 +188,9 @@ def _has_valid_tuple(self, key):
188
188
if i >= self .obj .ndim :
189
189
raise IndexingError ('Too many indexers' )
190
190
if not self ._has_valid_type (k , i ):
191
- raise ValueError ("Location based indexing can only have [%s] "
192
- "types" % self ._valid_types )
191
+ raise ValueError ("Location based indexing can only have "
192
+ "[{types}] types"
193
+ .format (types = self ._valid_types ))
193
194
194
195
def _should_validate_iterable (self , axis = 0 ):
195
196
""" return a boolean whether this axes needs validation for a passed
@@ -263,11 +264,11 @@ def _has_valid_positional_setitem_indexer(self, indexer):
263
264
pass
264
265
elif is_integer (i ):
265
266
if i >= len (ax ):
266
- raise IndexError ("{0 } cannot enlarge its target object "
267
- .format (self .name ))
267
+ raise IndexError ("{name } cannot enlarge its target "
268
+ "object" .format (name = self .name ))
268
269
elif isinstance (i , dict ):
269
- raise IndexError ("{0 } cannot enlarge its target object"
270
- .format (self .name ))
270
+ raise IndexError ("{name } cannot enlarge its target object"
271
+ .format (name = self .name ))
271
272
272
273
return True
273
274
@@ -1235,7 +1236,8 @@ def _convert_to_indexer(self, obj, axis=0, is_setter=False):
1235
1236
1236
1237
mask = check == - 1
1237
1238
if mask .any ():
1238
- raise KeyError ('%s not in index' % objarr [mask ])
1239
+ raise KeyError ('{mask} not in index'
1240
+ .format (mask = objarr [mask ]))
1239
1241
1240
1242
return _values_from_object (indexer )
1241
1243
@@ -1421,8 +1423,9 @@ def _has_valid_type(self, key, axis):
1421
1423
if (not is_iterator (key ) and len (key ) and
1422
1424
np .all (ax .get_indexer_for (key ) < 0 )):
1423
1425
1424
- raise KeyError ("None of [%s] are in the [%s]" %
1425
- (key , self .obj ._get_axis_name (axis )))
1426
+ raise KeyError ("None of [{key}] are in the [{axis}]"
1427
+ .format (key = key ,
1428
+ axis = self .obj ._get_axis_name (axis )))
1426
1429
1427
1430
return True
1428
1431
@@ -1432,8 +1435,9 @@ def error():
1432
1435
if isna (key ):
1433
1436
raise TypeError ("cannot use label indexing with a null "
1434
1437
"key" )
1435
- raise KeyError ("the label [%s] is not in the [%s]" %
1436
- (key , self .obj ._get_axis_name (axis )))
1438
+ raise KeyError ("the label [{key}] is not in the [{axis}]"
1439
+ .format (key = key ,
1440
+ axis = self .obj ._get_axis_name (axis )))
1437
1441
1438
1442
try :
1439
1443
key = self ._convert_scalar_indexer (key , axis )
0 commit comments