CLN: apply manual f-string fixes inspired by flynt -tc

Author: akx

asv_bench/benchmarks/categoricals.py

@@ -89,7 +89,7 @@ def setup(self):
         )
 
         for col in ("int", "float", "timestamp"):
-            self.df[col + "_as_str"] = self.df[col].astype(str)
+            self.df[f"{col}_as_str"] = self.df[col].astype(str)
 
         for col in self.df.columns:
             self.df[col] = self.df[col].astype("category")

asv_bench/benchmarks/frame_methods.py

@@ -125,7 +125,7 @@ def setup(self):
         self.df = DataFrame(np.random.randn(N * 10, N))
         self.df2 = DataFrame(np.random.randn(N * 50, 10))
         self.df3 = DataFrame(
-            np.random.randn(N, 5 * N), columns=["C" + str(c) for c in range(N * 5)]
+            np.random.randn(N, 5 * N), columns=[f"C{c}" for c in range(N * 5)]
         )
         self.df4 = DataFrame(np.random.randn(N * 1000, 10))
 

asv_bench/benchmarks/inference.py

@@ -166,14 +166,15 @@ def time_unique_date_strings(self, cache, count):
 
 
 class ToDatetimeISO8601:
+    sep_format = "%Y-%m-%d %H:%M:%S"
+    nosep_format = "%Y%m%d %H:%M:%S"
+
     def setup(self):
         rng = date_range(start="1/1/2000", periods=20000, freq="H")
-        self.strings = rng.strftime("%Y-%m-%d %H:%M:%S").tolist()
-        self.strings_nosep = rng.strftime("%Y%m%d %H:%M:%S").tolist()
-        self.strings_tz_space = [
-            x.strftime("%Y-%m-%d %H:%M:%S") + " -0800" for x in rng
-        ]
-        self.strings_zero_tz = [x.strftime("%Y-%m-%d %H:%M:%S") + "Z" for x in rng]
+        self.strings = rng.strftime(self.sep_format).tolist()
+        self.strings_nosep = rng.strftime(self.nosep_format).tolist()
+        self.strings_tz_space = [f"{x.strftime(self.sep_format)} -0800" for x in rng]
+        self.strings_zero_tz = [f"{x.strftime(self.sep_format)}Z" for x in rng]
 
     def time_iso8601(self):
         to_datetime(self.strings)
@@ -182,10 +183,10 @@ def time_iso8601_nosep(self):
         to_datetime(self.strings_nosep)
 
     def time_iso8601_format(self):
-        to_datetime(self.strings, format="%Y-%m-%d %H:%M:%S")
+        to_datetime(self.strings, format=self.sep_format)
 
     def time_iso8601_format_no_sep(self):
-        to_datetime(self.strings_nosep, format="%Y%m%d %H:%M:%S")
+        to_datetime(self.strings_nosep, format=self.nosep_format)
 
     def time_iso8601_tz_spaceformat(self):
         to_datetime(self.strings_tz_space)

pandas/_config/config.py

@@ -499,7 +499,7 @@ def register_option(
     path = key.split(".")
 
     for k in path:
-        if not re.match("^" + tokenize.Name + "$", k):
+        if not re.match(f"^{tokenize.Name}$", k):
             raise ValueError(f"{k} is not a valid identifier")
         if keyword.iskeyword(k):
             raise ValueError(f"{k} is a python keyword")
@@ -707,7 +707,7 @@ def pp_options_list(keys: Iterable[str], width: int = 80, _print: bool = False):
     from textwrap import wrap
 
     def pp(name: str, ks: Iterable[str]) -> list[str]:
-        pfx = "- " + name + ".[" if name else ""
+        pfx = f"- {name}.[" if name else ""
         ls = wrap(
             ", ".join(ks),
             width,
@@ -716,7 +716,7 @@ def pp(name: str, ks: Iterable[str]) -> list[str]:
             break_long_words=False,
         )
         if ls and ls[-1] and name:
-            ls[-1] = ls[-1] + "]"
+            ls[-1] = f"{ls[-1]}]"
         return ls
 
     ls: list[str] = []

pandas/conftest.py

@@ -1770,7 +1770,7 @@ def spmatrix(request):
     """
     from scipy import sparse
 
-    return getattr(sparse, request.param + "_matrix")
+    return getattr(sparse, f"{request.param}_matrix")
 
 
 @pytest.fixture(

pandas/core/arrays/categorical.py

@@ -2122,7 +2122,7 @@ def _repr_categories_info(self) -> str:
         start = True
         cur_col_len = len(levheader)  # header
         sep_len, sep = (3, " < ") if self.ordered else (2, ", ")
-        linesep = sep.rstrip() + "\n"  # remove whitespace
+        linesep = f"{sep.rstrip()}\n"  # remove whitespace
         for val in category_strs:
             if max_width != 0 and cur_col_len + sep_len + len(val) > max_width:
                 levstring += linesep + (" " * (len(levheader) + 1))
@@ -2133,7 +2133,7 @@ def _repr_categories_info(self) -> str:
             levstring += val
             start = False
         # replace to simple save space by
-        return levheader + "[" + levstring.replace(" < ... < ", " ... ") + "]"
+        return f"{levheader}[{levstring.replace(' < ... < ', ' ... ')}]"
 
     def _repr_footer(self) -> str:
         info = self._repr_categories_info()

pandas/core/arrays/masked.py

@@ -1058,7 +1058,7 @@ def _reduce(self, name: str, *, skipna: bool = True, **kwargs):
             data = self.to_numpy("float64", na_value=np.nan)
 
         # median, var, std, skew, kurt, idxmin, idxmax
-        op = getattr(nanops, "nan" + name)
+        op = getattr(nanops, f"nan{name}")
         result = op(data, axis=0, skipna=skipna, mask=mask, **kwargs)
 
         if np.isnan(result):

pandas/core/arrays/string_arrow.py

@@ -317,11 +317,11 @@ def _str_contains(
         return result
 
     def _str_startswith(self, pat: str, na=None):
-        pat = "^" + re.escape(pat)
+        pat = f"^{re.escape(pat)}"
         return self._str_contains(pat, na=na, regex=True)
 
     def _str_endswith(self, pat: str, na=None):
-        pat = re.escape(pat) + "$"
+        pat = f"{re.escape(pat)}$"
         return self._str_contains(pat, na=na, regex=True)
 
     def _str_replace(
@@ -345,14 +345,14 @@ def _str_match(
         self, pat: str, case: bool = True, flags: int = 0, na: Scalar | None = None
     ):
         if not pat.startswith("^"):
-            pat = "^" + pat
+            pat = f"^{pat}"
         return self._str_contains(pat, case, flags, na, regex=True)
 
     def _str_fullmatch(
         self, pat, case: bool = True, flags: int = 0, na: Scalar | None = None
     ):
         if not pat.endswith("$") or pat.endswith("//$"):
-            pat = pat + "$"
+            pat = f"{pat}$"
         return self._str_match(pat, case, flags, na)
 
     def _str_isalnum(self):

pandas/core/computation/expr.py

@@ -410,7 +410,7 @@ def visit(self, node, **kwargs):
                     e.msg = "Python keyword not valid identifier in numexpr query"
                 raise e
 
-        method = "visit_" + type(node).__name__
+        method = f"visit_{type(node).__name__}"
         visitor = getattr(self, method)
         return visitor(node, **kwargs)
 

pandas/core/computation/parsing.py

@@ -59,7 +59,7 @@ def create_valid_python_identifier(name: str) -> str:
     )
 
     name = "".join([special_characters_replacements.get(char, char) for char in name])
-    name = "BACKTICK_QUOTED_STRING_" + name
+    name = f"BACKTICK_QUOTED_STRING_{name}"
 
     if not name.isidentifier():
         raise SyntaxError(f"Could not convert '{name}' to a valid Python identifier.")