Skip to content

CLN: replace %s syntax with .format in pandas.core.indexes #26159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions pandas/core/indexes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -927,14 +927,15 @@ def __unicode__(self):
attrs = self._format_attrs()
space = self._format_space()

prepr = (",%s" %
space).join("%s=%s" % (k, v) for k, v in attrs)
prepr = (",{space}".format(space=space)).join(
"{k}={v}".format(k=k, v=v) for k, v in attrs)

# no data provided, just attributes
if data is None:
data = ''

res = "%s(%s%s)" % (klass, data, prepr)
res = "{klass}({data}{prepr})".format(
klass=klass, data=data, prepr=prepr)

return res

Expand Down Expand Up @@ -1410,14 +1411,14 @@ def _validate_index_level(self, level):
if isinstance(level, int):
if level < 0 and level != -1:
raise IndexError("Too many levels: Index has only 1 level,"
" %d is not a valid level number" % (level, ))
" {level} is not a valid level"
" number".format(level=level))
elif level > 0:
raise IndexError("Too many levels:"
" Index has only 1 level, not %d" %
(level + 1))
raise IndexError("Too many levels: Index has only 1 level, not"
" {level}".format(level=(level + 1)))
elif level != self.name:
raise KeyError('Level %s must be same as name (%s)' %
(level, self.name))
raise KeyError("Level {level} must be same as name ({name})"
"".format(level=level, name=self.name))

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

if isinstance(slc, slice):
if side == 'left':
Expand Down
7 changes: 4 additions & 3 deletions pandas/core/indexes/frozen.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def __unicode__(self):
escape_chars=('\t', '\r', '\n'))

def __repr__(self):
return "%s(%s)" % (self.__class__.__name__,
str(self))
return "{class_name}({list!s})".format(
class_name=self.__class__.__name__, list=self)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you use a kwarg other than list here to avoid overlap with builtin name


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

@deprecate_kwarg(old_arg_name="v", new_arg_name="value")
def searchsorted(self, value, side="left", sorter=None):
Expand Down
12 changes: 7 additions & 5 deletions pandas/core/indexes/multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,11 @@ def _verify_integrity(self, codes=None, levels=None):
raise ValueError("Unequal code lengths: %s" %
([len(code_) for code_ in codes]))
if len(level_codes) and level_codes.max() >= len(level):
raise ValueError("On level %d, code max (%d) >= length of"
" level (%d). NOTE: this index is in an"
" inconsistent state" % (i, level_codes.max(),
len(level)))
raise ValueError("On level {index}, code max ({max}) >= "
"length of level ({length}). NOTE: this "
"index is in an inconsistent state".format(
index=i, max=level_codes.max(),
length=len(level)))
if not level.is_unique:
raise ValueError("Level values must be unique: {values} on "
"level {level}".format(
Expand Down Expand Up @@ -923,7 +924,8 @@ def _format_attrs(self):
return attrs

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

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