Skip to content

Commit 2d5b1ae

Browse files
committed
CLN: replace %s syntax with .format in pandas.core.indexes
progress towards pandas-dev#16130
1 parent c79b7bb commit 2d5b1ae

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

Diff for: pandas/core/indexes/base.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -927,14 +927,15 @@ def __unicode__(self):
927927
attrs = self._format_attrs()
928928
space = self._format_space()
929929

930-
prepr = (",%s" %
931-
space).join("%s=%s" % (k, v) for k, v in attrs)
930+
prepr = (",{space}".format(space=space)).join(
931+
"{k}={v}".format(k=k, v=v) for k, v in attrs)
932932

933933
# no data provided, just attributes
934934
if data is None:
935935
data = ''
936936

937-
res = "%s(%s%s)" % (klass, data, prepr)
937+
res = "{klass}({data}{prepr})".format(
938+
klass=klass, data=data, prepr=prepr)
938939

939940
return res
940941

@@ -1410,14 +1411,14 @@ def _validate_index_level(self, level):
14101411
if isinstance(level, int):
14111412
if level < 0 and level != -1:
14121413
raise IndexError("Too many levels: Index has only 1 level,"
1413-
" %d is not a valid level number" % (level, ))
1414+
" {level} is not a valid level number"
1415+
"".format(level=level))
14141416
elif level > 0:
1415-
raise IndexError("Too many levels:"
1416-
" Index has only 1 level, not %d" %
1417-
(level + 1))
1417+
raise IndexError("Too many levels: Index has only 1 level, not"
1418+
" {level}".format(level=(level + 1)))
14181419
elif level != self.name:
1419-
raise KeyError('Level %s must be same as name (%s)' %
1420-
(level, self.name))
1420+
raise KeyError("Level {level} must be same as name ({name})"
1421+
"".format(level=level, name=self.name))
14211422

14221423
def _get_level_number(self, level):
14231424
self._validate_index_level(level)
@@ -4808,8 +4809,9 @@ def get_slice_bound(self, label, side, kind):
48084809
else:
48094810
slc = lib.maybe_indices_to_slice(slc.astype('i8'), len(self))
48104811
if isinstance(slc, np.ndarray):
4811-
raise KeyError("Cannot get %s slice bound for non-unique "
4812-
"label: %r" % (side, original_label))
4812+
raise KeyError("Cannot get {side} slice bound for non-unique "
4813+
"label: {original_label!r}".format(
4814+
side=side, original_label=original_label))
48134815

48144816
if isinstance(slc, slice):
48154817
if side == 'left':

Diff for: pandas/core/indexes/frozen.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def __unicode__(self):
113113
escape_chars=('\t', '\r', '\n'))
114114

115115
def __repr__(self):
116-
return "%s(%s)" % (self.__class__.__name__,
117-
str(self))
116+
return "{class_name}({list!s})".format(
117+
class_name=self.__class__.__name__, list=self)
118118

119119
__setitem__ = __setslice__ = __delitem__ = __delslice__ = _disabled
120120
pop = append = extend = remove = sort = insert = _disabled
@@ -155,7 +155,8 @@ def __unicode__(self):
155155
"""
156156
prepr = pprint_thing(self, escape_chars=('\t', '\r', '\n'),
157157
quote_strings=True)
158-
return "%s(%s, dtype='%s')" % (type(self).__name__, prepr, self.dtype)
158+
return "{ctype}({prepr}, dtype='{dtype}')".format(
159+
ctype=type(self).__name__, prepr=prepr, dtype=self.dtype)
159160

160161
@deprecate_kwarg(old_arg_name="v", new_arg_name="value")
161162
def searchsorted(self, value, side="left", sorter=None):

Diff for: pandas/core/indexes/multi.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,11 @@ def _verify_integrity(self, codes=None, levels=None):
278278
raise ValueError("Unequal code lengths: %s" %
279279
([len(code_) for code_ in codes]))
280280
if len(level_codes) and level_codes.max() >= len(level):
281-
raise ValueError("On level %d, code max (%d) >= length of"
282-
" level (%d). NOTE: this index is in an"
283-
" inconsistent state" % (i, level_codes.max(),
284-
len(level)))
281+
raise ValueError("On level {index}, code max ({max}) >= "
282+
"length of level ({length}). NOTE: this "
283+
"index is in an inconsistent state".format(
284+
index=i, max=level_codes.max(),
285+
length=len(level)))
285286
if not level.is_unique:
286287
raise ValueError("Level values must be unique: {values} on "
287288
"level {level}".format(
@@ -923,7 +924,8 @@ def _format_attrs(self):
923924
return attrs
924925

925926
def _format_space(self):
926-
return "\n%s" % (' ' * (len(self.__class__.__name__) + 1))
927+
return "\n{space}".format(
928+
space=(' ' * (len(self.__class__.__name__) + 1)))
927929

928930
def _format_data(self, name=None):
929931
# we are formatting thru the attributes

0 commit comments

Comments
 (0)