Skip to content

Commit 2362414

Browse files
jschendeljreback
authored andcommitted
CLN: replace %s syntax with .format in pandas.util (#17224)
1 parent 989babd commit 2362414

File tree

4 files changed

+141
-122
lines changed

4 files changed

+141
-122
lines changed

pandas/util/_decorators.py

+16-10
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ def deprecate(name, alternative, alt_name=None, klass=None,
2727
klass = klass or FutureWarning
2828

2929
def wrapper(*args, **kwargs):
30-
warnings.warn("%s is deprecated. Use %s instead" % (name, alt_name),
31-
klass, stacklevel=stacklevel)
30+
msg = "{name} is deprecated. Use {alt_name} instead".format(
31+
name=name, alt_name=alt_name)
32+
warnings.warn(msg, klass, stacklevel=stacklevel)
3233
return alternative(*args, **kwargs)
3334
return wrapper
3435

@@ -90,19 +91,24 @@ def wrapper(*args, **kwargs):
9091
old_arg_value)
9192
else:
9293
new_arg_value = mapping(old_arg_value)
93-
msg = "the %s=%r keyword is deprecated, " \
94-
"use %s=%r instead" % \
95-
(old_arg_name, old_arg_value,
96-
new_arg_name, new_arg_value)
94+
msg = ("the {old_name}={old_val!r} keyword is deprecated, "
95+
"use {new_name}={new_val!r} instead"
96+
).format(old_name=old_arg_name,
97+
old_val=old_arg_value,
98+
new_name=new_arg_name,
99+
new_val=new_arg_value)
97100
else:
98101
new_arg_value = old_arg_value
99-
msg = "the '%s' keyword is deprecated, " \
100-
"use '%s' instead" % (old_arg_name, new_arg_name)
102+
msg = ("the '{old_name}' keyword is deprecated, "
103+
"use '{new_name}' instead"
104+
).format(old_name=old_arg_name,
105+
new_name=new_arg_name)
101106

102107
warnings.warn(msg, FutureWarning, stacklevel=stacklevel)
103108
if kwargs.get(new_arg_name, None) is not None:
104-
msg = ("Can only specify '%s' or '%s', not both" %
105-
(old_arg_name, new_arg_name))
109+
msg = ("Can only specify '{old_name}' or '{new_name}', "
110+
"not both").format(old_name=old_arg_name,
111+
new_name=new_arg_name)
106112
raise TypeError(msg)
107113
else:
108114
kwargs[new_arg_name] = new_arg_value

pandas/util/_print_versions.py

+12-13
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,17 @@ def get_sys_info():
3838
(sysname, nodename, release,
3939
version, machine, processor) = platform.uname()
4040
blob.extend([
41-
("python", "%d.%d.%d.%s.%s" % sys.version_info[:]),
41+
("python", '.'.join(map(str, sys.version_info))),
4242
("python-bits", struct.calcsize("P") * 8),
43-
("OS", "%s" % (sysname)),
44-
("OS-release", "%s" % (release)),
45-
# ("Version", "%s" % (version)),
46-
("machine", "%s" % (machine)),
47-
("processor", "%s" % (processor)),
48-
("byteorder", "%s" % sys.byteorder),
49-
("LC_ALL", "%s" % os.environ.get('LC_ALL', "None")),
50-
("LANG", "%s" % os.environ.get('LANG', "None")),
51-
("LOCALE", "%s.%s" % locale.getlocale()),
52-
43+
("OS", "{sysname}".format(sysname=sysname)),
44+
("OS-release", "{release}".format(release=release)),
45+
# ("Version", "{version}".format(version=version)),
46+
("machine", "{machine}".format(machine=machine)),
47+
("processor", "{processor}".format(processor=processor)),
48+
("byteorder", "{byteorder}".format(byteorder=sys.byteorder)),
49+
("LC_ALL", "{lc}".format(lc=os.environ.get('LC_ALL', "None"))),
50+
("LANG", "{lang}".format(lang=os.environ.get('LANG', "None"))),
51+
("LOCALE", '.'.join(map(str, locale.getlocale()))),
5352
])
5453
except:
5554
pass
@@ -131,11 +130,11 @@ def show_versions(as_json=False):
131130
print("------------------")
132131

133132
for k, stat in sys_info:
134-
print("%s: %s" % (k, stat))
133+
print("{k}: {stat}".format(k=k, stat=stat))
135134

136135
print("")
137136
for k, stat in deps_blob:
138-
print("%s: %s" % (k, stat))
137+
print("{k}: {stat}".format(k=k, stat=stat))
139138

140139

141140
def main():

pandas/util/_validators.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def validate_args_and_kwargs(fname, args, kwargs,
220220
def validate_bool_kwarg(value, arg_name):
221221
""" Ensures that argument passed in arg_name is of type bool. """
222222
if not (is_bool(value) or value is None):
223-
raise ValueError('For argument "%s" expected type bool, '
224-
'received type %s.' %
225-
(arg_name, type(value).__name__))
223+
raise ValueError('For argument "{arg}" expected type bool, received '
224+
'type {typ}.'.format(arg=arg_name,
225+
typ=type(value).__name__))
226226
return value

0 commit comments

Comments
 (0)