simpler error message

Author: topper-123

pandas/core/indexes/base.py

@@ -452,11 +452,7 @@ def __new__(
                         except IncompatibleFrequency:
                             pass
             if kwargs:
-                if len(kwargs) == 1:
-                    msg = f"Unexpected keyword argument {list(kwargs)[0]!r}"
-                else:
-                    msg = f"Unexpected keyword arguments {set(kwargs)!r}"
-                raise TypeError(msg)
+                raise TypeError(f"Unexpected keyword arguments {set(kwargs)!r}")
             return cls._simple_new(subarr, name, **kwargs)
 
         elif hasattr(data, "__array__"):

pandas/tests/indexes/multi/test_equivalence.py

@@ -146,7 +146,7 @@ def test_identical(idx):
     assert mi.identical(mi2)
 
     mi3 = Index(mi.tolist(), names=mi.names)
-    msg = r"Unexpected keyword argument 'names'"
+    msg = r"Unexpected keyword arguments {'names'}"
     with pytest.raises(TypeError, match=msg):
         Index(mi.tolist(), names=mi.names, tupleize_cols=False)
     mi4 = Index(mi.tolist(), tupleize_cols=False)

pandas/tests/indexes/test_base.py

@@ -352,7 +352,7 @@ def test_constructor_simple_new(self, vals, dtype):
 
     def test_constructor_wrong_kwargs(self):
         # GH #19348
-        with pytest.raises(TypeError, match="Unexpected keyword argument 'foo'"):
+        with pytest.raises(TypeError, match="Unexpected keyword arguments {'foo'}"):
             Index([], foo="bar")
 
     @pytest.mark.parametrize(

pandas/tests/indexing/test_coercion.py

@@ -490,7 +490,7 @@ def test_insert_index_period(self, insert, coerced_val, coerced_dtype):
             exp = pd.PeriodIndex(data, freq="M")
             self._assert_insert_conversion(obj, insert, exp, coerced_dtype)
         else:
-            msg = r"Unexpected keyword argument 'freq'"
+            msg = r"Unexpected keyword arguments {'freq'}"
             with pytest.raises(TypeError, match=msg):
                 pd.Index(data, freq="M")
 

pandas/tests/io/excel/test_readers.py

@@ -893,7 +893,7 @@ def test_excel_passes_na_filter(self, read_ext, na_filter):
     def test_unexpected_kwargs_raises(self, read_ext, arg):
         # gh-17964
         kwarg = {arg: "Sheet1"}
-        msg = "unexpected keyword argument `{}`".format(arg)
+        msg = r"unexpected keyword argument `{}`".format(arg)
 
         with pd.ExcelFile("test1" + read_ext) as excel:
             with pytest.raises(TypeError, match=msg):