Update whatsnew entry, modify tests for read_html to expect FutureWarning.

Author: alexitkes

doc/source/whatsnew/v0.25.1.rst

@@ -7,18 +7,6 @@
 What's new in 0.25.1 (July XX, 2019)
 ------------------------------------
 
-.. warning::
-
-   Starting with the version 0.25.1, :func:`read_html` function
-   should get all its arguments but `io` and `match` as keyword
-   keyword only.
-
-.. warning::
-
-   Starting with the version 0.25.1, :func:`read_json` function
-   should get all its arguments but `path_or_buf` as keyword
-   arguments only.
-
 Enhancements
 ~~~~~~~~~~~~
 

doc/source/whatsnew/v1.0.0.rst

@@ -53,8 +53,13 @@ Other API changes
 Deprecations
 ~~~~~~~~~~~~
 
--
--
+-  Passing any arguments but `io` to  :func:`read_html` as positional
+   arguments is deprecated since version 1.0. All other arguments should
+   be given as keyword arguments (:issue:`27573`).
+
+-  Passing any arguments but `path_or_buf` to  :func:`read_json` as positional
+   arguments is deprecated since version 1.0. All other arguments should
+   be given as keyword arguments (:issue:`27573`).
 
 .. _whatsnew_1000.prior_deprecations:
 

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.0", allowed_args=["io", "match"])
+@deprecate_nonkeyword_arguments(version="1.1", allowed_args=["io"])
 def read_html(
     io,
     match=".+",

pandas/io/json/_json.py

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

pandas/tests/io/test_html.py

@@ -137,21 +137,65 @@ def test_spam_url(self):
             "http://ndb.nal.usda.gov/ndb/foods/show/300772?fg=&man=&"
             "lfacet=&format=&count=&max=25&offset=&sort=&qlookup=spam"
         )
-        df1 = self.read_html(url, ".*Water.*")
-        df2 = self.read_html(url, "Unit")
+        # This test gives match to read_html as a positional
+        # argument that is now deprecated, so expect FutureWarning
+        with tm.assert_produces_warning(FutureWarning):
+            df1 = self.read_html(url, ".*Water.*")
+        with tm.assert_produces_warning(FutureWarning):
+            df2 = self.read_html(url, "Unit")
+
+        assert_framelist_equal(df1, df2)
+
+    @network
+    def test_spam_url_match_kwarg(self):
+        url = (
+            "http://ndb.nal.usda.gov/ndb/foods/show/300772?fg=&man=&"
+            "lfacet=&format=&count=&max=25&offset=&sort=&qlookup=spam"
+        )
+        # Just like test_spam_url, but passes match as a keyword argument,
+        # so expect no FutureWarning.
+        df1 = self.read_html(url, match=".*Water.*")
+        df2 = self.read_html(url, match="Unit")
 
         assert_framelist_equal(df1, df2)
 
     @pytest.mark.slow
     def test_banklist(self):
-        df1 = self.read_html(self.banklist_data, ".*Florida.*", attrs={"id": "table"})
-        df2 = self.read_html(self.banklist_data, "Metcalf Bank", attrs={"id": "table"})
+        # This test gives match to read_html as a positional
+        # argument that is now deprecated, so expect FutureWarning
+        with tm.assert_produces_warning(FutureWarning):
+            df1 = self.read_html(self.banklist_data, ".*Florida.*", attrs={"id": "table"})
+        with tm.assert_produces_warning(FutureWarning):
+            df2 = self.read_html(self.banklist_data, "Metcalf Bank", attrs={"id": "table"})
+
+        assert_framelist_equal(df1, df2)
+
+    @pytest.mark.slow
+    def test_banklist_match_kwarg(self):
+        # Just like test_banklist, but passes match as a keyword argument,
+        # so expect no FutureWarning.
+        df1 = self.read_html(self.banklist_data, match=".*Florida.*", attrs={"id": "table"})
+        df2 = self.read_html(self.banklist_data, match="Metcalf Bank", attrs={"id": "table"})
 
         assert_framelist_equal(df1, df2)
 
     def test_spam(self):
-        df1 = self.read_html(self.spam_data, ".*Water.*")
-        df2 = self.read_html(self.spam_data, "Unit")
+        # This test gives match to read_html as a positional
+        # argument that is now deprecated, so expect FutureWarning
+        with tm.assert_produces_warning(FutureWarning):
+            df1 = self.read_html(self.spam_data, ".*Water.*")
+        with tm.assert_produces_warning(FutureWarning):
+            df2 = self.read_html(self.spam_data, "Unit")
+        assert_framelist_equal(df1, df2)
+
+        assert df1[0].iloc[0, 0] == "Proximates"
+        assert df1[0].columns[0] == "Nutrient"
+
+    def test_spam_match_kwarg(self):
+        # Just like test_spam, but passes match as a keyword argument,
+        # so expect no FutureWarning.
+        df1 = self.read_html(self.spam_data, match=".*Water.*")
+        df2 = self.read_html(self.spam_data, match="Unit")
         assert_framelist_equal(df1, df2)
 
         assert df1[0].iloc[0, 0] == "Proximates"