Update warnings messages.

The positional arguments are now said to become unavailable since version
1.4. Also str.format() method called properly and updated numerous docstrings.

Author: alexitkes

pandas/io/html.py

@@ -921,7 +921,7 @@ def _parse(flavor, io, match, attrs, encoding, displayed_only, **kwargs):
     return ret
 
 
-@deprecate_nonkeyword_arguments(version="1.1")
+@deprecate_nonkeyword_arguments(version="1.4")
 def read_html(
     io,
     match=".+",

pandas/io/json/_json.py

@@ -332,7 +332,7 @@ def _write(
         return serialized
 
 
-@deprecate_nonkeyword_arguments(version="1.1", allowed_args=['path_or_buf'])
+@deprecate_nonkeyword_arguments(version="1.4", allowed_args=["path_or_buf"])
 def read_json(
     path_or_buf=None,
     orient=None,

pandas/tests/io/json/test_deprecated_kwargs.py

@@ -15,12 +15,15 @@ def test_deprecated_kwargs():
     argument passed as positional.
     """
     df = pd.DataFrame({"A": [2, 4, 6], "B": [3, 6, 9]}, index=[0, 1, 2])
+    buf = df.to_json(orient="split")
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df, read_json(df.to_json(orient="split"), "split"))
+        assert_frame_equal(df, read_json(buf, "split"))
+    buf = df.to_json(orient="columns")
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df, read_json(df.to_json(orient="columns"), "columns"))
+        assert_frame_equal(df, read_json(buf, "columns"))
+    buf = df.to_json(orient="index")
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df, read_json(df.to_json(orient="index"), "index"))
+        assert_frame_equal(df, read_json(buf, "index"))
 
 
 def test_good_kwargs():
@@ -29,6 +32,9 @@ def test_good_kwargs():
     argument passed as keyword.
     """
     df = pd.DataFrame({"A": [2, 4, 6], "B": [3, 6, 9]}, index=[0, 1, 2])
-    assert_frame_equal(df, read_json(df.to_json(orient="split"), orient="split"))
-    assert_frame_equal(df, read_json(df.to_json(orient="columns"), orient="columns"))
-    assert_frame_equal(df, read_json(df.to_json(orient="index"), orient="index"))
+    with tm.assert_produces_warning(None):
+        assert_frame_equal(df, read_json(df.to_json(orient="split"), orient="split"))
+        assert_frame_equal(
+            df, read_json(df.to_json(orient="columns"), orient="columns")
+        )
+        assert_frame_equal(df, read_json(df.to_json(orient="index"), orient="index"))

pandas/tests/io/test_html.py

@@ -125,9 +125,9 @@ def test_to_html_compat(self):
     def test_banklist_url(self):
         url = "http://www.fdic.gov/bank/individual/failed/banklist.html"
         df1 = self.read_html(
-            url, "First Federal Bank of Florida", attrs={"id": "table"}
+            url, match="First Federal Bank of Florida", attrs={"id": "table"}
         )
-        df2 = self.read_html(url, "Metcalf Bank", attrs={"id": "table"})
+        df2 = self.read_html(url, match="Metcalf Bank", attrs={"id": "table"})
 
         assert_framelist_equal(df1, df2)
 
@@ -1004,7 +1004,7 @@ def test_wikipedia_states_table(self, datapath):
         data = datapath("io", "data", "wikipedia_states.html")
         assert os.path.isfile(data), "{data!r} is not a file".format(data=data)
         assert os.path.getsize(data), "{data!r} is an empty file".format(data=data)
-        result = self.read_html(data, "Arizona", header=1)[0]
+        result = self.read_html(data, match="Arizona", header=1)[0]
         assert result["sq mi"].dtype == np.dtype("float64")
 
     def test_parser_error_on_empty_header_row(self):

pandas/tests/util/test_deprecate_nonkeyword_arguments.py

@@ -16,12 +16,13 @@ def f(a, b=0, c=0, d=0):
     return a + b + c + d
 
 
-def test_one_arguments():
+def test_one_argument():
     """
     Check whether no future warning is produced if one
     positional argument given.
     """
-    assert f(19) == 19
+    with tm.assert_produces_warning(None):
+        assert f(19) == 19
 
 
 def test_one_and_one_arguments():
@@ -30,15 +31,17 @@ def test_one_and_one_arguments():
     positional argument and one keyword argument are
     given.
     """
-    assert f(19, d=6) == 25
+    with tm.assert_produces_warning(None):
+        assert f(19, d=6) == 25
 
 
 def test_two_arguments():
     """
     Check whether no future warning is produced if two
     positional arguments given.
     """
-    assert f(1, 5) == 6
+    with tm.assert_produces_warning(None):
+        assert f(1, 5) == 6
 
 
 def test_two_and_two_arguments():
@@ -47,7 +50,8 @@ def test_two_and_two_arguments():
     positional arguments and two keyword arguments are
     given.
     """
-    assert f(1, 3, c=3, d=5) == 12
+    with tm.assert_produces_warning(None):
+        assert f(1, 3, c=3, d=5) == 12
 
 
 def test_three_arguments():
@@ -71,10 +75,11 @@ def test_four_arguments():
 @deprecate_nonkeyword_arguments(version="1.1")
 def g(a, b=0, c=0, d=0):
     """
-    Sum of one to four numbers, the two last arguments
-    should be given as keyword arguments only
+    Sum of one to four numbers, but three of them have default
+    values, so may be given as keyword arguments only.
     """
-    return a + b + c + d
+    with tm.assert_produces_warning(None):
+        return a + b + c + d
 
 
 def test_one_and_three_arguments_default_allowed_args():
@@ -85,7 +90,8 @@ def test_one_and_three_arguments_default_allowed_args():
     option, meaning that all arguments with default value
     are keyword-only.
     """
-    assert g(1, b=3, c=3, d=5) == 12
+    with tm.assert_produces_warning(None):
+        assert g(1, b=3, c=3, d=5) == 12
 
 
 def test_three_arguments_default_allowed_args():

pandas/util/_decorators.py

@@ -224,7 +224,7 @@ def deprecate_nonkeyword_arguments(
         The version in which positional arguments will become
         keyword-only.
 
-    allowed_args : list, int or None, default=None
+    allowed_args : list or int, optional
         In case of list, it must be the list of names of some
         first arguments of the decorated functions that are
         OK to be given as positional arguments. In case of an
@@ -248,14 +248,20 @@ def decorate(func):
         def wrapper(*args, **kwargs):
             if isinstance(allow_args, int) and len(args) > allow_args:
                 msg = (
-                    "After version %s all arguments of %s "
-                    "except for the first %i will be keyword-only"
-                ) % (version, func.__name__, allow_args)
+                    "After Pandas version {version} all arguments of {funcname} "
+                    "except for the first {num_args} will be keyword-only"
+                ).format(version=version, funcname=func.__name__, num_args=allow_args)
             elif isinstance(allow_args, (list, tuple)) and len(args) > len(allow_args):
                 msg = (
-                    "After version %s all arguments of %s "
-                    "except for (%s) will be keyword-only"
-                ) % (version, func.__name__, ", ".join(allow_args))
+                    "After Pandas version {version} all arguments of {funcname} "
+                    "except for {first_args} will be keyword-only"
+                ).format(
+                    version=version,
+                    funcname=func.__name__,
+                    first_args="(" + ", ".join(allow_args) + ")"
+                    if len(allow_args) > 1
+                    else allow_args[0],
+                )
             else:
                 msg = None
             if msg: