Improve code quality

lorien · Feb 26, 2022 · 69575eb · 69575eb
1 parent f972f19
commit 69575eb
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 57 deletions.
diff --git a/grab/transport/urllib3.py b/grab/transport/urllib3.py
@@ -8,15 +8,15 @@
 from contextlib import contextmanager
 import ssl
 from typing import cast
-
-from urllib3.exceptions import LocationParseError
 import urllib.request
 from http.client import HTTPResponse
+
 from six.moves.urllib.parse import urlsplit
 from six.moves.http_cookiejar import CookieJar
 import six
 from weblib.http import normalize_url, normalize_post_data, normalize_http_values
 from weblib.encoding import make_str, make_unicode, decode_pairs
+from urllib3.exceptions import LocationParseError
 from urllib3 import PoolManager, ProxyManager, exceptions, make_headers
 from urllib3.filepost import encode_multipart_formdata
 from urllib3.fields import RequestField

diff --git a/grab/util/log.py b/grab/util/log.py
@@ -1,7 +1,4 @@
 import logging
-import sys
-from contextlib import contextmanager
-from io import TextIOBase
 
 
 def setup_logger(

diff --git a/grab/util/warning.py b/grab/util/warning.py
@@ -1,5 +1,4 @@
 import warnings
-from functools import wraps
 import logging
 import traceback
 import sys

diff --git a/tests/grab_cookies.py b/tests/grab_cookies.py
@@ -1,7 +1,6 @@
+from pprint import pprint  # pylint: disable=unused-import
 import json
 import pickle
-from pprint import pprint
-from urllib.request import Request
 
 from test_server import Response
 

diff --git a/tests/grab_debug.py b/tests/grab_debug.py
@@ -4,7 +4,6 @@
 from mock import patch
 from test_server import Response
 
-from grab.error import GrabTimeoutError
 from grab import Grab
 from grab import base
 

diff --git a/tests/grab_defusedxml.py b/tests/grab_defusedxml.py
@@ -6,9 +6,8 @@
 
 from lxml.etree import parse  # pytype: disable=import-error
 from six import BytesIO
-from defusedxml import EntitiesForbidden
 
-from tests.util import temp_dir, build_grab
+from tests.util import temp_dir
 from tests.util import BaseGrabTestCase
 
 

diff --git a/tests/grab_pickle.py b/tests/grab_pickle.py
@@ -1,10 +1,11 @@
-import pickle
+# import pickle
 
-from six.moves.queue import Queue
-from test_server import Response
+# from six.moves.queue import Queue
+# from test_server import Response
 
 from tests.util import BaseGrabTestCase
-from tests.util import build_grab
+
+# from tests.util import build_grab
 
 
 class TestGrab(BaseGrabTestCase):

diff --git a/tests/grab_request.py b/tests/grab_request.py
@@ -2,12 +2,12 @@
 
 from test_server import Response
 
-from grab.error import (
-    GrabInternalError,
-    GrabCouldNotResolveHostError,
-    GrabTimeoutError,
-    GrabInvalidUrl,
-)
+# from grab.error import (
+#    GrabInternalError,
+#    GrabCouldNotResolveHostError,
+#    GrabTimeoutError,
+#    GrabInvalidUrl,
+# )
 
 from tests.util import build_grab
 from tests.util import BaseGrabTestCase

diff --git a/tests/grab_sigint.py b/tests/grab_sigint.py
diff --git a/tests/grab_transport.py b/tests/grab_transport.py
@@ -60,7 +60,8 @@
 #        self.assertEqual(grab3.doc.body, response)
 #
 #    # def test_transport_option_as_string_DEPRECATED(self):
-#    #    self.assert_transport_response("grab.transport.DEPRECATED.DEPRECATEDTransport", b"XYZ")
+#    #    self.assert_transport_response(
+#    #        "grab.transport.DEPRECATED.DEPRECATEDTransport", b"XYZ")
 #
 #    # def test_transport_option_as_string_fake(self):
 #    #    with temp_dir() as dir_:
@@ -71,7 +72,8 @@
 #    #        sys.path.remove(dir_)
 #
 #    # def test_transport_option_as_class_DEPRECATED(self):
-#    #    from grab.transport.DEPRECATED import (  # pylint: disable=import-outside-toplevel
+#    #    from grab.transport.DEPRECATED \
+#    #    import (  # pylint: disable=import-outside-toplevel
 #    #        DEPRECATEDTransport,
 #    #    )
 #
@@ -113,10 +115,12 @@
 #        self.assertTrue(grab.transport is None)
 #
 #        grab.setup_transport(None)
-#        self.assertEqual(grab.transport_param, "grab.transport.DEPRECATED.DEPRECATEDTransport")
+#        self.assertEqual(grab.transport_param,
+#            "grab.transport.DEPRECATED.DEPRECATEDTransport")
 #
 #    def test_setup_transport_callable(self):
-#        from grab.transport.DEPRECATED import (  # pylint: disable=import-outside-toplevel
+#        from grab.transport.DEPRECATED import (\
+#            pylint: disable=import-outside-toplevel
 #            DEPRECATEDTransport,
 #        )
 #

diff --git a/tests/misc.py b/tests/misc.py
@@ -2,8 +2,6 @@
 
 from test_server import Response  # pylint: disable=unused-import
 
-from grab.util.log import default_logging
-
 from tests.util import build_grab  # pylint: disable=unused-import
 from tests.util import BaseGrabTestCase
 

diff --git a/tests/util_log.py b/tests/util_log.py
@@ -1,6 +1,4 @@
-# coding: utf-8
 from unittest import TestCase
-import sys
 
 from grab.util.log import default_logging
 from tests.util import temp_file