Skip to content

Replace .format with f-strings #31627

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.

Sign up for GitHub

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
wants to merge 12 commits into from
Closed

Replace .format with f-strings #31627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23ffcff
Replace .format with f-strings
leandermaben Feb 3, 2020
c3d341c
Replace .format with f-strings
leandermaben Feb 3, 2020
e01a1b6
Replace .format with f-strings
leandermaben Feb 4, 2020
0e755d1
Replace .format with f-strings in files
leandermaben Feb 4, 2020
60a3934
Replace .format with f-strings in files
leandermaben Feb 4, 2020
91911c7
Replace .format with f-strings in files
leandermaben Feb 4, 2020
d1ee1f1
Replace .format with f-strings in files
leandermaben Feb 4, 2020
f3b8601
Replace .format with f-strings in files
leandermaben Feb 4, 2020
1cb0458
Replace .format with f-strings in files
leandermaben Feb 4, 2020
62fae22
Replace .format with f-strings in files
leandermaben Feb 4, 2020
e3316c5
Replace .format with f-strings in files
leandermaben Feb 4, 2020
fb46c48
Merge branch 'master' of https://github.com/pandas-dev/pandas
leandermaben Feb 4, 2020
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
8 changes: 4 additions & 4 deletions pandas/tests/tslibs/test_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ def test_parse_time_quarter_with_dash(dashed, normal):

@pytest.mark.parametrize("dashed", ["-2Q1992", "2-Q1992", "4-4Q1992"])
def test_parse_time_quarter_with_dash_error(dashed):
msg = "Unknown datetime string format, unable to parse: {dashed}"
msg = f"Unknown datetime string format, unable to parse: {dashed}"

with pytest.raises(parsing.DateParseError, match=msg.format(dashed=dashed)):
with pytest.raises(parsing.DateParseError, match=msg):
parse_time_string(dashed)


Expand Down Expand Up @@ -118,9 +118,9 @@ def test_parsers_quarter_invalid(date_str):
"must be between 1 and 4: {date_str}"
)
else:
msg = "Unknown datetime string format, unable to parse: {date_str}"
msg = f"Unknown datetime string format, unable to parse: {date_str}"

with pytest.raises(ValueError, match=msg.format(date_str=date_str)):
with pytest.raises(ValueError, match=msg):
parsing.parse_time_string(date_str)


Expand Down
7 changes: 3 additions & 4 deletions pandas/util/_print_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_sys_info() -> List[Tuple[str, Optional[Union[str, int]]]]:
("python-bits", struct.calcsize("P") * 8),
("OS", f"{sysname}"),
("OS-release", f"{release}"),
# ("Version", "{version}".format(version=version)),
# ("Version", f"{version}"),
("machine", f"{machine}"),
("processor", f"{processor}"),
("byteorder", f"{sys.byteorder}"),
Expand Down Expand Up @@ -114,14 +114,13 @@ def show_versions(as_json=False):

else:
maxlen = max(len(x) for x in deps)
tpl = "{{k:<{maxlen}}}: {{stat}}".format(maxlen=maxlen)
print("\nINSTALLED VERSIONS")
print("------------------")
for k, stat in sys_info:
print(tpl.format(k=k, stat=stat))
print(f"{{k:<{maxlen}}}: {{stat}}")
print("")
for k, stat in deps_blob:
print(tpl.format(k=k, stat=stat))
print(f"{{k:<{maxlen}}}: {{stat}}")


def main() -> int:
Expand Down