Skip to content

Commit 85dc336

Browse files
committed
CLN: Old string formatting: .format() -> f
1 parent a2bbdb5 commit 85dc336

File tree

1 file changed

+17
-24
lines changed

1 file changed

+17
-24
lines changed

pandas/_version.py

+17-24
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
7979
if e.errno == errno.ENOENT:
8080
continue
8181
if verbose:
82-
print("unable to run {dispcmd}".format(dispcmd=dispcmd))
82+
print(f"unable to run {dispcmd}")
8383
print(e)
8484
return None
8585
else:
@@ -89,7 +89,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
8989
stdout = p.communicate()[0].strip().decode()
9090
if p.returncode != 0:
9191
if verbose:
92-
print("unable to run {dispcmd} (error)".format(dispcmd=dispcmd))
92+
print(f"unable to run {dispcmd} (error)")
9393
return None
9494
return stdout
9595

@@ -101,10 +101,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
101101
if not dirname.startswith(parentdir_prefix):
102102
if verbose:
103103
print(
104-
"guessing rootdir is '{root}', but '{dirname}' "
105-
"doesn't start with prefix '{parentdir_prefix}'".format(
106-
root=root, dirname=dirname, parentdir_prefix=parentdir_prefix
107-
)
104+
f"guessing rootdir is '{root}', but '{dirname}' doesn't start with prefix '{parentdir_prefix}'"
108105
)
109106
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
110107
return {
@@ -163,15 +160,15 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
163160
# "stabilization", as well as "HEAD" and "master".
164161
tags = {r for r in refs if re.search(r"\d", r)}
165162
if verbose:
166-
print("discarding '{}', no digits".format(",".join(refs - tags)))
163+
print(f"discarding '{','.join(refs - tags)}', no digits")
167164
if verbose:
168-
print("likely tags: {}".format(",".join(sorted(tags))))
165+
print(f"likely tags: {','.join(sorted(tags))}")
169166
for ref in sorted(tags):
170167
# sorting will prefer e.g. "2.0" over "2.0rc1"
171168
if ref.startswith(tag_prefix):
172169
r = ref[len(tag_prefix) :]
173170
if verbose:
174-
print("picking {r}".format(r=r))
171+
print(f"picking {r}")
175172
return {
176173
"version": r,
177174
"full-revisionid": keywords["full"].strip(),
@@ -198,7 +195,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
198195

199196
if not os.path.exists(os.path.join(root, ".git")):
200197
if verbose:
201-
print("no .git in {root}".format(root=root))
198+
print(f"no .git in {root}")
202199
raise NotThisMethod("no .git directory")
203200

204201
GITS = ["git"]
@@ -240,17 +237,13 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
240237
mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
241238
if not mo:
242239
# unparseable. Maybe git-describe is misbehaving?
243-
pieces["error"] = (
244-
"unable to parse git-describe output: "
245-
"'{describe_out}'".format(describe_out=describe_out)
246-
)
240+
pieces["error"] = f"unable to parse git-describe output: '{describe_out}'"
247241
return pieces
248242

249243
# tag
250244
full_tag = mo.group(1)
251245
if not full_tag.startswith(tag_prefix):
252-
fmt = "tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
253-
msg = fmt.format(full_tag=full_tag, tag_prefix=tag_prefix)
246+
msg = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
254247
if verbose:
255248
print(msg)
256249
pieces["error"] = msg
@@ -291,12 +284,12 @@ def render_pep440(pieces):
291284
rendered = pieces["closest-tag"]
292285
if pieces["distance"] or pieces["dirty"]:
293286
rendered += plus_or_dot(pieces)
294-
rendered += "{:d}.g{}".format(pieces["distance"], pieces["short"])
287+
rendered += f"{pieces['distance']:d}.g{pieces['short']}"
295288
if pieces["dirty"]:
296289
rendered += ".dirty"
297290
else:
298291
# exception #1
299-
rendered = "0+untagged.{:d}.g{}".format(pieces["distance"], pieces["short"])
292+
rendered = f"0+untagged.{pieces['distance']:d}.g{pieces['short']}"
300293
if pieces["dirty"]:
301294
rendered += ".dirty"
302295
return rendered
@@ -330,17 +323,17 @@ def render_pep440_post(pieces):
330323
if pieces["closest-tag"]:
331324
rendered = pieces["closest-tag"]
332325
if pieces["distance"] or pieces["dirty"]:
333-
rendered += ".post{:d}".format(pieces["distance"])
326+
rendered += f".post{pieces['distance']:d}"
334327
if pieces["dirty"]:
335328
rendered += ".dev0"
336329
rendered += plus_or_dot(pieces)
337-
rendered += "g{}".format(pieces["short"])
330+
rendered += f"g{pieces['short']}"
338331
else:
339332
# exception #1
340333
rendered = "0.post%d" % pieces["distance"]
341334
if pieces["dirty"]:
342335
rendered += ".dev0"
343-
rendered += "+g{}".format(pieces["short"])
336+
rendered += f"+g{pieces['short']}"
344337
return rendered
345338

346339

@@ -374,7 +367,7 @@ def render_git_describe(pieces):
374367
if pieces["closest-tag"]:
375368
rendered = pieces["closest-tag"]
376369
if pieces["distance"]:
377-
rendered += "-{:d}-g{}".format(pieces["distance"], pieces["short"])
370+
rendered += f"-{pieces['distance']:d}-g{pieces['short']}"
378371
else:
379372
# exception #1
380373
rendered = pieces["short"]
@@ -392,7 +385,7 @@ def render_git_describe_long(pieces):
392385

393386
if pieces["closest-tag"]:
394387
rendered = pieces["closest-tag"]
395-
rendered += "-{:d}-g{}".format(pieces["distance"], pieces["short"])
388+
rendered += f"-{pieces['distance']:d}-g{pieces['short']}"
396389
else:
397390
# exception #1
398391
rendered = pieces["short"]
@@ -426,7 +419,7 @@ def render(pieces, style):
426419
elif style == "git-describe-long":
427420
rendered = render_git_describe_long(pieces)
428421
else:
429-
raise ValueError("unknown style '{style}'".format(style=style))
422+
raise ValueError(f"unknown style '{style}'")
430423

431424
return {
432425
"version": rendered,

0 commit comments

Comments
 (0)