Merge remote-tracking branch 'upstream/master' into STY-repr-batch-3

Author: MomIsBestFriend

pandas/errors/__init__.py

@@ -167,9 +167,7 @@ class AbstractMethodError(NotImplementedError):
     def __init__(self, class_instance, methodtype="method"):
         types = {"method", "classmethod", "staticmethod", "property"}
         if methodtype not in types:
-            msg = "methodtype must be one of {}, got {} instead.".format(
-                methodtype, types
-            )
+            msg = f"methodtype must be one of {methodtype}, got {types} instead."
             raise ValueError(msg)
         self.methodtype = methodtype
         self.class_instance = class_instance
@@ -179,5 +177,5 @@ def __str__(self) -> str:
             name = self.class_instance.__name__
         else:
             name = type(self.class_instance).__name__
-        msg = "This {methodtype} must be defined in the concrete class {name}"
+        msg = f"This {self.methodtype} must be defined in the concrete class {name}"
         return msg.format(methodtype=self.methodtype, name=name)

pandas/tests/arrays/interval/test_ops.py

@@ -83,8 +83,6 @@ def test_overlaps_na(self, constructor, start_shift):
     )
     def test_overlaps_invalid_type(self, constructor, other):
         interval_container = constructor.from_breaks(range(5))
-        msg = "`other` must be Interval-like, got {other}".format(
-            other=type(other).__name__
-        )
+        msg = f"`other` must be Interval-like, got {type(other).__name__}"
         with pytest.raises(TypeError, match=msg):
             interval_container.overlaps(other)

pandas/tests/arrays/sparse/test_array.py

@@ -1007,7 +1007,7 @@ def test_cumsum(self, data, expected, numpy):
                 np.cumsum(SparseArray(data), out=out)
         else:
             axis = 1  # SparseArray currently 1-D, so only axis = 0 is valid.
-            msg = "axis\\(={axis}\\) out of bounds".format(axis=axis)
+            msg = re.escape(f"axis(={axis}) out of bounds")
             with pytest.raises(ValueError, match=msg):
                 SparseArray(data).cumsum(axis=axis)
 

pandas/tests/arrays/sparse/test_libsparse.py

@@ -596,6 +596,6 @@ def _check_case(xloc, xlen, yloc, ylen, eloc, elen):
 
     @pytest.mark.parametrize("opname", ["add", "sub", "mul", "truediv", "floordiv"])
     def test_op(self, opname):
-        sparse_op = getattr(splib, "sparse_{opname}_float64".format(opname=opname))
+        sparse_op = getattr(splib, f"sparse_{opname}_float64")
         python_op = getattr(operator, opname)
         self._op_tests(sparse_op, python_op)

pandas/tests/extension/arrow/arrays.py

@@ -33,7 +33,7 @@ def construct_from_string(cls, string):
         if string == cls.name:
             return cls()
         else:
-            raise TypeError("Cannot construct a '{}' from '{}'".format(cls, string))
+            raise TypeError(f"Cannot construct a '{cls}' from '{string}'")
 
     @classmethod
     def construct_array_type(cls):
@@ -56,7 +56,7 @@ def construct_from_string(cls, string):
         if string == cls.name:
             return cls()
         else:
-            raise TypeError("Cannot construct a '{}' from '{}'".format(cls, string))
+            raise TypeError(f"Cannot construct a '{cls}' from '{string}'")
 
     @classmethod
     def construct_array_type(cls):
@@ -79,7 +79,7 @@ def _from_sequence(cls, scalars, dtype=None, copy=False):
         return cls.from_scalars(scalars)
 
     def __repr__(self):
-        return "{cls}({data})".format(cls=type(self).__name__, data=repr(self._data))
+        return f"{type(self).__name__}({repr(self._data)})"
 
     def __getitem__(self, item):
         if pd.api.types.is_scalar(item):

pandas/tests/extension/base/printing.py

@@ -19,7 +19,7 @@ def test_array_repr(self, data, size):
 
         result = repr(data)
         assert type(data).__name__ in result
-        assert "Length: {}".format(len(data)) in result
+        assert f"Length: {len(data)}" in result
         assert str(data.dtype) in result
         if size == "big":
             assert "..." in result

pandas/tests/extension/decimal/array.py

@@ -23,7 +23,7 @@ def __init__(self, context=None):
         self.context = context or decimal.getcontext()
 
     def __repr__(self) -> str:
-        return "DecimalDtype(context={})".format(self.context)
+        return f"DecimalDtype(context={self.context})"
 
     @classmethod
     def construct_array_type(cls):
@@ -40,7 +40,7 @@ def construct_from_string(cls, string):
         if string == cls.name:
             return cls()
         else:
-            raise TypeError("Cannot construct a '{}' from '{}'".format(cls, string))
+            raise TypeError(f"Cannot construct a '{cls}' from '{string}'")
 
     @property
     def _is_numeric(self):
@@ -178,9 +178,7 @@ def _reduce(self, name, skipna=True, **kwargs):
         try:
             op = getattr(self.data, name)
         except AttributeError:
-            raise NotImplementedError(
-                "decimal does not support the {} operation".format(name)
-            )
+            raise NotImplementedError(f"decimal does not support the {name} operation")
         return op(axis=0)
 
 

pandas/tests/resample/test_datetime_index.py

@@ -146,9 +146,7 @@ def test_resample_basic_grouper(series):
 def test_resample_string_kwargs(series, keyword, value):
     # see gh-19303
     # Check that wrong keyword argument strings raise an error
-    msg = "Unsupported value {value} for `{keyword}`".format(
-        value=value, keyword=keyword
-    )
+    msg = f"Unsupported value {value} for `{keyword}`"
     with pytest.raises(ValueError, match=msg):
         series.resample("5min", **({keyword: value}))
 

pandas/tests/resample/test_time_grouper.py

@@ -89,7 +89,7 @@ def test_fails_on_no_datetime_index(name, func):
 
     msg = (
         "Only valid with DatetimeIndex, TimedeltaIndex "
-        "or PeriodIndex, but got an instance of '{}'".format(name)
+        f"or PeriodIndex, but got an instance of '{name}'"
     )
     with pytest.raises(TypeError, match=msg):
         df.groupby(Grouper(freq="D"))

pandas/tests/scalar/test_nat.py

@@ -141,7 +141,7 @@ def test_round_nat(klass, method, freq):
 )
 def test_nat_methods_raise(method):
     # see gh-9513, gh-17329
-    msg = "NaTType does not support {method}".format(method=method)
+    msg = f"NaTType does not support {method}"
 
     with pytest.raises(ValueError, match=msg):
         getattr(NaT, method)()