From 23ffcffcb6974af53fe7111568fad06c8e6da463 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Mon, 3 Feb 2020 23:14:20 +0530 Subject: [PATCH 01/11] Replace .format with f-strings --- pandas/util/_print_versions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/util/_print_versions.py b/pandas/util/_print_versions.py index 2801a2bf9c371..3f126bfcf7565 100644 --- a/pandas/util/_print_versions.py +++ b/pandas/util/_print_versions.py @@ -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}"), @@ -114,14 +114,14 @@ def show_versions(as_json=False): else: maxlen = max(len(x) for x in deps) - tpl = "{{k:<{maxlen}}}: {{stat}}".format(maxlen=maxlen) + tpl = f"{k}:<{maxlen}: {stat}" print("\nINSTALLED VERSIONS") print("------------------") for k, stat in sys_info: - print(tpl.format(k=k, stat=stat)) + print(tpl) print("") for k, stat in deps_blob: - print(tpl.format(k=k, stat=stat)) + print(tpl) def main() -> int: @@ -147,4 +147,4 @@ def main() -> int: if __name__ == "__main__": - sys.exit(main()) + sys.exit(main()) \ No newline at end of file From c3d341c49a6bd0f9632bd135ba28a9d5a3ed6034 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Mon, 3 Feb 2020 23:40:25 +0530 Subject: [PATCH 02/11] Replace .format with f-strings --- pandas/util/_print_versions.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pandas/util/_print_versions.py b/pandas/util/_print_versions.py index 3f126bfcf7565..b67114afa0338 100644 --- a/pandas/util/_print_versions.py +++ b/pandas/util/_print_versions.py @@ -114,14 +114,13 @@ def show_versions(as_json=False): else: maxlen = max(len(x) for x in deps) - tpl = f"{k}:<{maxlen}: {stat}" print("\nINSTALLED VERSIONS") print("------------------") for k, stat in sys_info: - print(tpl) + print(f"{k}:<{maxlen}: {stat}") print("") for k, stat in deps_blob: - print(tpl) + print(f"{k}:<{maxlen}: {stat}") def main() -> int: @@ -147,4 +146,4 @@ def main() -> int: if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file + sys.exit(main()) From e01a1b68349fc86ae28aed56c5a8b720e6dbd337 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 06:47:03 +0530 Subject: [PATCH 03/11] Replace .format with f-strings --- pandas/util/_print_versions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/util/_print_versions.py b/pandas/util/_print_versions.py index b67114afa0338..1268e8a42a255 100644 --- a/pandas/util/_print_versions.py +++ b/pandas/util/_print_versions.py @@ -117,10 +117,10 @@ def show_versions(as_json=False): print("\nINSTALLED VERSIONS") print("------------------") for k, stat in sys_info: - print(f"{k}:<{maxlen}: {stat}") + print(f"{{k:<{maxlen}}}: {{stat}}") print("") for k, stat in deps_blob: - print(f"{k}:<{maxlen}: {stat}") + print(f"{{k:<{maxlen}}}: {{stat}}") def main() -> int: From 0e755d1aee41aa597bb1fa045ad976359a886d73 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 14:33:11 +0530 Subject: [PATCH 04/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index a715094e65e98..cb7186782bcff 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -293,13 +293,13 @@ def validate_axis_style_args(data, args, kwargs, arg_name, method_name): raise TypeError(msg) msg = ( - "Interpreting call\n\t'.{method_name}(a, b)' as " - "\n\t'.{method_name}(index=a, columns=b)'.\nUse named " - "arguments to remove any ambiguity. In the future, using " - "positional arguments for 'index' or 'columns' will raise " - "a 'TypeError'." + f"Interpreting call\n\t'.{method_name}(a, b)' as " + f"\n\t'.{method_name}(index=a, columns=b)'.\nUse named " + f"arguments to remove any ambiguity. In the future, using " + f"positional arguments for 'index' or 'columns' will raise " + f"a 'TypeError'." ) - warnings.warn(msg.format(method_name=method_name), FutureWarning, stacklevel=4) + warnings.warn(msg, FutureWarning, stacklevel=4) out[data._AXIS_NAMES[0]] = args[0] out[data._AXIS_NAMES[1]] = args[1] else: @@ -367,12 +367,12 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: ------ ValueError if percentiles are not in given interval([0, 1]). """ - msg = "percentiles should all be in the interval [0, 1]. Try {0} instead." + msg = f"percentiles should all be in the interval [0, 1]. Try {q_arr/100.0} instead." q_arr = np.asarray(q) if q_arr.ndim == 0: if not 0 <= q_arr <= 1: - raise ValueError(msg.format(q_arr / 100.0)) + raise ValueError(msg) else: if not all(0 <= qs <= 1 for qs in q_arr): - raise ValueError(msg.format(q_arr / 100.0)) + raise ValueError(msg) return q_arr From 60a3934a7e265c2b5493591147ff2a5d1a64496a Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 14:54:05 +0530 Subject: [PATCH 05/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index cb7186782bcff..f6b174191b275 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -367,8 +367,11 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: ------ ValueError if percentiles are not in given interval([0, 1]). """ - msg = f"percentiles should all be in the interval [0, 1]. Try {q_arr/100.0} instead." q_arr = np.asarray(q) + msg = ( + f"percentiles should all be in the interval [0, 1]." + f" Try {q_arr/100.0} instead." + ) if q_arr.ndim == 0: if not 0 <= q_arr <= 1: raise ValueError(msg) From 91911c79f9bbf62b676633244976cf5830c3dfa5 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 15:15:30 +0530 Subject: [PATCH 06/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index f6b174191b275..3a17f7dd25526 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -369,9 +369,9 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: """ q_arr = np.asarray(q) msg = ( - f"percentiles should all be in the interval [0, 1]." - f" Try {q_arr/100.0} instead." - ) + f"percentiles should all be in the interval [0, 1]." + f" Try {q_arr/100.0} instead." + ) if q_arr.ndim == 0: if not 0 <= q_arr <= 1: raise ValueError(msg) From d1ee1f1f76fc9bbd966442c1256b239f755a4622 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 17:56:15 +0530 Subject: [PATCH 07/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index 3a17f7dd25526..2dfd3e93bd8cb 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -368,10 +368,8 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: ValueError if percentiles are not in given interval([0, 1]). """ q_arr = np.asarray(q) - msg = ( - f"percentiles should all be in the interval [0, 1]." - f" Try {q_arr/100.0} instead." - ) + msg = (f"percentiles should all be in the interval [0, 1]." + f" Try {q_arr/100.0} instead.") if q_arr.ndim == 0: if not 0 <= q_arr <= 1: raise ValueError(msg) From f3b86019d4975dbe91bb2c7d5f025eafaa508194 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 18:22:44 +0530 Subject: [PATCH 08/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index 2dfd3e93bd8cb..3260d272eac1e 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -369,7 +369,7 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: """ q_arr = np.asarray(q) msg = (f"percentiles should all be in the interval [0, 1]." - f" Try {q_arr/100.0} instead.") + f" Try {q_arr/100.0} instead.") if q_arr.ndim == 0: if not 0 <= q_arr <= 1: raise ValueError(msg) From 1cb045865da251c655e2bee23b5ae9c66b397e53 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 18:43:38 +0530 Subject: [PATCH 09/11] Replace .format with f-strings in files --- pandas/util/_validators.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pandas/util/_validators.py b/pandas/util/_validators.py index 3260d272eac1e..a715094e65e98 100644 --- a/pandas/util/_validators.py +++ b/pandas/util/_validators.py @@ -293,13 +293,13 @@ def validate_axis_style_args(data, args, kwargs, arg_name, method_name): raise TypeError(msg) msg = ( - f"Interpreting call\n\t'.{method_name}(a, b)' as " - f"\n\t'.{method_name}(index=a, columns=b)'.\nUse named " - f"arguments to remove any ambiguity. In the future, using " - f"positional arguments for 'index' or 'columns' will raise " - f"a 'TypeError'." + "Interpreting call\n\t'.{method_name}(a, b)' as " + "\n\t'.{method_name}(index=a, columns=b)'.\nUse named " + "arguments to remove any ambiguity. In the future, using " + "positional arguments for 'index' or 'columns' will raise " + "a 'TypeError'." ) - warnings.warn(msg, FutureWarning, stacklevel=4) + warnings.warn(msg.format(method_name=method_name), FutureWarning, stacklevel=4) out[data._AXIS_NAMES[0]] = args[0] out[data._AXIS_NAMES[1]] = args[1] else: @@ -367,13 +367,12 @@ def validate_percentile(q: Union[float, Iterable[float]]) -> np.ndarray: ------ ValueError if percentiles are not in given interval([0, 1]). """ + msg = "percentiles should all be in the interval [0, 1]. Try {0} instead." q_arr = np.asarray(q) - msg = (f"percentiles should all be in the interval [0, 1]." - f" Try {q_arr/100.0} instead.") if q_arr.ndim == 0: if not 0 <= q_arr <= 1: - raise ValueError(msg) + raise ValueError(msg.format(q_arr / 100.0)) else: if not all(0 <= qs <= 1 for qs in q_arr): - raise ValueError(msg) + raise ValueError(msg.format(q_arr / 100.0)) return q_arr From 62fae22735fe711fe0271725c8296a1832babc94 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 22:32:00 +0530 Subject: [PATCH 10/11] Replace .format with f-strings in files --- pandas/tests/tslibs/test_parsing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/tests/tslibs/test_parsing.py b/pandas/tests/tslibs/test_parsing.py index c452d5b12ce01..d8d395728cd26 100644 --- a/pandas/tests/tslibs/test_parsing.py +++ b/pandas/tests/tslibs/test_parsing.py @@ -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) @@ -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) From e3316c52bd3bfe9bea0472cd8b3bfe8c4329cf52 Mon Sep 17 00:00:00 2001 From: leandermaben Date: Tue, 4 Feb 2020 22:54:58 +0530 Subject: [PATCH 11/11] Replace .format with f-strings in files --- pandas/tests/tslibs/test_parsing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/tslibs/test_parsing.py b/pandas/tests/tslibs/test_parsing.py index d8d395728cd26..660b1a6e295ed 100644 --- a/pandas/tests/tslibs/test_parsing.py +++ b/pandas/tests/tslibs/test_parsing.py @@ -44,7 +44,7 @@ def test_parse_time_quarter_with_dash(dashed, normal): def test_parse_time_quarter_with_dash_error(dashed): msg = f"Unknown datetime string format, unable to parse: {dashed}" - with pytest.raises(parsing.DateParseError, match=msg: + with pytest.raises(parsing.DateParseError, match=msg): parse_time_string(dashed)