Fix a flake8 warnings and reformat the code.

Author: alexitkes

pandas/tests/io/json/test_deprecated_kwargs.py

@@ -2,9 +2,10 @@
 Tests for the deprecated keyword arguments for `read_json`.
 """
 
-import pytest
-
 import pandas as pd
+
+from pandas.io.json import read_json
+
 import pandas.util.testing as tm
 
 from pandas.util.testing import assert_frame_equal
@@ -15,31 +16,21 @@ def test_deprecated_kwargs():
     Check whether FutureWarning is produced if `orient`
     argument passed as positional.
     """
-    df = pd.DataFrame({'A': [2, 4, 6],
-                       'B': [3, 6, 9]},
-                      index=[0, 1, 2])
+    df = pd.DataFrame({"A": [2, 4, 6], "B": [3, 6, 9]}, index=[0, 1, 2])
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df,
-                           read_json(df.to_json(orient="split"), "split"))
+        assert_frame_equal(df, read_json(df.to_json(orient="split"), "split"))
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df,
-                           read_json(df.to_json(orient="columns"), "columns"))
+        assert_frame_equal(df, read_json(df.to_json(orient="columns"), "columns"))
     with tm.assert_produces_warning(FutureWarning):
-        assert_frame_equal(df,
-                           read_json(df.to_json(orient="index"), "index"))
+        assert_frame_equal(df, read_json(df.to_json(orient="index"), "index"))
 
 
 def test_good_kwargs():
     """
     Check whether FutureWarning is not produced if `orient`
     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"), "split"))
-    assert_frame_equal(df,
-                       read_json(df.to_json(orient="columns"), "columns"))
-    assert_frame_equal(df,
-                       read_json(df.to_json(orient="index"), "index"))
+    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"), "split"))
+    assert_frame_equal(df, read_json(df.to_json(orient="columns"), "columns"))
+    assert_frame_equal(df, read_json(df.to_json(orient="index"), "index"))

pandas/tests/io/test_html.py

@@ -164,18 +164,26 @@ def test_banklist(self):
         # 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"})
+            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"})
+            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"})
+        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)
 
@@ -228,6 +236,8 @@ def test_skiprows_int(self):
         with tm.assert_produces_warning(FutureWarning):
             df2 = self.read_html(self.spam_data, "Unit", skiprows=1)
 
+        assert_framelist_equal(df1, df2)
+
     def test_skiprows_int_match_kwarg(self):
         df1 = self.read_html(self.spam_data, match=".*Water.*", skiprows=1)
         df2 = self.read_html(self.spam_data, match="Unit", skiprows=1)

pandas/util/_decorators.py

@@ -213,7 +213,7 @@ def wrapper(*args, **kwargs):
 
 
 def deprecate_nonkeyword_arguments(
-    version: str, allowed_args = None, *, stacklevel: int = 2
+    version: str, allowed_args=None, stacklevel: int = 2
 ) -> Callable:
     """
     Decorator to deprecate a use of non-keyword arguments of a function.
@@ -237,24 +237,25 @@ def deprecate_nonkeyword_arguments(
         The stack level for warnings.warn
     """
 
-    if allowed_args is None:
-        spec = inspect.getfullargspec(func).args
-        allowed_args = spec.args[:-len(spec.defaults)]
     def decorate(func):
+        if allowed_args is None:
+            spec = inspect.getfullargspec(func).args
+            allow_args = spec.args[: -len(spec.defaults)]
+        else:
+            allow_args = allowed_args
+
         @wraps(func)
         def wrapper(*args, **kwargs):
-            if isinstance(allowed_args, int) and len(args) > allowed_args:
+            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__, allowed_args)
-            elif isinstance(allowed_args, (list, tuple)) and len(args) > len(
-                allowed_args
-            ):
+                ) % (version, func.__name__, 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(allowed_args))
+                ) % (version, func.__name__, ", ".join(allow_args))
             else:
                 msg = None
             if msg: