Format using isort/black to satisfy linter

31 files changed, 148 insertions, 127 deletions

diff --git a/src/webob/acceptparse.py b/src/webob/acceptparse.py
index 2c8aa1d..ee5e78b 100644
--- a/src/webob/acceptparse.py
+++ b/src/webob/acceptparse.py
@@ -10,7 +10,6 @@ import re
 import textwrap
 import warnings
 
-
 # RFC 7230 Section 3.2.3 "Whitespace"
 # OWS            = *( SP / HTAB )
 #                ; optional whitespace
diff --git a/src/webob/client.py b/src/webob/client.py
index 6ec7742..f8c380d 100644
--- a/src/webob/client.py
+++ b/src/webob/client.py
@@ -1,14 +1,16 @@
 import errno
-import sys
 import re
+import sys
 
 try:
     import httplib
 except ImportError:
     import http.client as httplib
-from webob.compat import url_quote
+
 import socket
+
 from webob import exc
+from webob.compat import url_quote
 
 __all__ = ["send_request_app", "SendRequest"]
 
diff --git a/src/webob/compat.py b/src/webob/compat.py
index fd46a85..effa79d 100644
--- a/src/webob/compat.py
+++ b/src/webob/compat.py
@@ -1,23 +1,19 @@
 # flake8: noqa
 
 import cgi
+from cgi import FieldStorage as _cgi_FieldStorage, parse_header
+from html import escape
+from queue import Empty, Queue
 import sys
 import tempfile
 import types
-from cgi import FieldStorage as _cgi_FieldStorage
-from cgi import parse_header
-
-from html import escape
-from queue import Empty, Queue
 from urllib import parse
-from urllib.parse import quote as url_quote
-from urllib.parse import quote_plus
-from urllib.parse import urlencode as url_encode
+from urllib.parse import quote as url_quote, quote_plus, urlencode as url_encode
 from urllib.request import urlopen as url_open
 
-
 urlparse = parse
 
+
 def unquote(string):
     if not string:
         return b""
@@ -57,7 +53,7 @@ def parse_qsl_text(qs, encoding="utf-8"):
 # Various different FieldStorage work-arounds required on Python 3.x
 class cgi_FieldStorage(_cgi_FieldStorage):  # pragma: no cover
     def __repr__(self):
-        """ monkey patch for FieldStorage.__repr__
+        """monkey patch for FieldStorage.__repr__
 
         Unbelievably, the default __repr__ on FieldStorage reads
         the entire file content instead of being sane about it.
diff --git a/src/webob/cookies.py b/src/webob/cookies.py
index 3048d5f..3f7c669 100644
--- a/src/webob/cookies.py
+++ b/src/webob/cookies.py
@@ -1,5 +1,7 @@
 import base64
 import binascii
+from collections.abc import MutableMapping
+from datetime import date, datetime, timedelta
 import hashlib
 import hmac
 import json
@@ -7,8 +9,6 @@ import re
 import string
 import time
 import warnings
-from collections.abc import MutableMapping
-from datetime import date, datetime, timedelta
 
 from webob.util import bytes_, strings_differ, text_
 
diff --git a/src/webob/datetime_utils.py b/src/webob/datetime_utils.py
index 9acc28a..b9bbb43 100644
--- a/src/webob/datetime_utils.py
+++ b/src/webob/datetime_utils.py
@@ -1,7 +1,7 @@
 import calendar
-import time
 from datetime import date, datetime, timedelta, tzinfo
 from email.utils import formatdate, mktime_tz, parsedate_tz
+import time
 
 from webob.util import text_
 
diff --git a/src/webob/descriptors.py b/src/webob/descriptors.py
index f790746..e24b4f4 100644
--- a/src/webob/descriptors.py
+++ b/src/webob/descriptors.py
@@ -1,16 +1,11 @@
-import re
-
-from datetime import date, datetime
-
 from collections import namedtuple
+from datetime import date, datetime
+import re
 
 from webob.byterange import ContentRange, Range
-
 from webob.datetime_utils import parse_date, serialize_date
-
 from webob.util import header_docstring, warn_deprecation
 
-
 CHARSET_RE = re.compile(r";\s*charset=([^;]*)", re.I)
 SCHEME_RE = re.compile(r"^[a-z]+:", re.I)
 
diff --git a/src/webob/exc.py b/src/webob/exc.py
index f4745e7..be53625 100644
--- a/src/webob/exc.py
+++ b/src/webob/exc.py
@@ -167,8 +167,8 @@ References:
 
 import json
 import re
-import sys
 from string import Template
+import sys
 
 from webob.acceptparse import create_accept_header
 from webob.compat import urlparse
@@ -277,7 +277,7 @@ ${body}"""
         comment=None,
         body_template=None,
         json_formatter=None,
-        **kw
+        **kw,
     ):
         Response.__init__(self, status="%s %s" % (self.code, self.title), **kw)
         Exception.__init__(self, detail)
diff --git a/src/webob/multidict.py b/src/webob/multidict.py
index 523ddd4..50ddd81 100644
--- a/src/webob/multidict.py
+++ b/src/webob/multidict.py
@@ -5,8 +5,8 @@
 Gives a multi-value dictionary object (MultiDict) plus several wrappers
 """
 import binascii
-import warnings
 from collections.abc import MutableMapping
+import warnings
 
 from webob.compat import url_encode
 
diff --git a/src/webob/request.py b/src/webob/request.py
index 7408255..b0920d3 100644
--- a/src/webob/request.py
+++ b/src/webob/request.py
@@ -44,7 +44,7 @@ from webob.descriptors import (
 from webob.etag import AnyETag, IfRange, NoETag, etag_property
 from webob.headers import EnvironHeaders
 from webob.multidict import GetDict, MultiDict, NestedMultiDict, NoVars
-from webob.util import text_, bytes_
+from webob.util import bytes_, text_
 
 try:
     import simplejson as json
diff --git a/src/webob/response.py b/src/webob/response.py
index 435ea62..48cb06d 100644
--- a/src/webob/response.py
+++ b/src/webob/response.py
@@ -1,9 +1,9 @@
-import re
-import struct
-import zlib
 from base64 import b64encode
 from datetime import datetime, timedelta
 from hashlib import md5
+import re
+import struct
+import zlib
 
 from webob.byterange import ContentRange
 from webob.cachecontrol import CacheControl, serialize_cache_control
@@ -173,7 +173,7 @@ class Response:
         content_type=None,
         conditional_response=None,
         charset=_marker,
-        **kw
+        **kw,
     ):
         # Do some sanity checking, and turn json_body into an actual body
 
diff --git a/src/webob/static.py b/src/webob/static.py
index 508d2a5..114bfd0 100644
--- a/src/webob/static.py
+++ b/src/webob/static.py
@@ -58,7 +58,7 @@ class FileApp:
             content_length=stat.st_size,
             last_modified=stat.st_mtime,
             # @@ etag
-            **self.kw
+            **self.kw,
         ).conditional_response_app
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 675c024..f8a1073 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,13 +1,15 @@
-import pytest
-import threading
-import random
-import logging
 from contextlib import contextmanager
+import logging
+import random
+import threading
+from wsgiref.simple_server import (
+    ServerHandler,
+    WSGIRequestHandler,
+    WSGIServer,
+    make_server,
+)
 
-from wsgiref.simple_server import make_server
-from wsgiref.simple_server import WSGIRequestHandler
-from wsgiref.simple_server import WSGIServer
-from wsgiref.simple_server import ServerHandler
+import pytest
 
 log = logging.getLogger(__name__)
 ServerHandler.handle_error = lambda: None
diff --git a/tests/performance_test.py b/tests/performance_test.py
index 9b4397b..0d5f932 100644
--- a/tests/performance_test.py
+++ b/tests/performance_test.py
@@ -20,9 +20,9 @@ def simple_app(environ, start_response):
 
 
 if __name__ == "__main__":
-    import sys
     import os
     import signal
+    import sys
 
     if sys.argv[1:]:
         arg = sys.argv[1]
@@ -30,8 +30,8 @@ if __name__ == "__main__":
         arg = None
     if arg in ["open", "run"]:
         import subprocess
-        import webbrowser
         import time
+        import webbrowser
 
         os.environ["SHOW_OUTPUT"] = "0"
         proc = subprocess.Popen([sys.executable, __file__])
diff --git a/tests/test_acceptparse.py b/tests/test_acceptparse.py
index 725919a..736a682 100644
--- a/tests/test_acceptparse.py
+++ b/tests/test_acceptparse.py
@@ -2,6 +2,7 @@ import re
 import warnings
 
 import pytest
+
 from webob.acceptparse import (
     Accept,
     AcceptCharset,
diff --git a/tests/test_byterange.py b/tests/test_byterange.py
index 0ae819c..a10a9f6 100644
--- a/tests/test_byterange.py
+++ b/tests/test_byterange.py
@@ -1,6 +1,7 @@
 from collections.abc import Iterable
 
 import pytest
+
 from webob.byterange import ContentRange, Range, _is_content_range_valid
 
 # Range class
diff --git a/tests/test_cachecontrol.py b/tests/test_cachecontrol.py
index 78b6f1a..5162858 100644
--- a/tests/test_cachecontrol.py
+++ b/tests/test_cachecontrol.py
@@ -211,28 +211,28 @@ def test_serialize_cache_control_emptydict():
 
 
 def test_serialize_cache_control_cache_control_object():
-    from webob.cachecontrol import serialize_cache_control, CacheControl
+    from webob.cachecontrol import CacheControl, serialize_cache_control
 
     result = serialize_cache_control(CacheControl({}, "request"))
     assert result == ""
 
 
 def test_serialize_cache_control_object_with_headers():
-    from webob.cachecontrol import serialize_cache_control, CacheControl
+    from webob.cachecontrol import CacheControl, serialize_cache_control
 
     result = serialize_cache_control(CacheControl({"header": "a"}, "request"))
     assert result == "header=a"
 
 
 def test_serialize_cache_control_value_is_None():
-    from webob.cachecontrol import serialize_cache_control, CacheControl
+    from webob.cachecontrol import CacheControl, serialize_cache_control
 
     result = serialize_cache_control(CacheControl({"header": None}, "request"))
     assert result == "header"
 
 
 def test_serialize_cache_control_value_needs_quote():
-    from webob.cachecontrol import serialize_cache_control, CacheControl
+    from webob.cachecontrol import CacheControl, serialize_cache_control
 
     result = serialize_cache_control(CacheControl({"header": '""'}, "request"))
     assert result == 'header=""""'
diff --git a/tests/test_client.py b/tests/test_client.py
index a3294f1..de9635e 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -1,6 +1,6 @@
-import unittest
 import io
 import socket
+import unittest
 
 
 class TestSendRequest(unittest.TestCase):
diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py
index d84ef86..32f884e 100644
--- a/tests/test_client_functional.py
+++ b/tests/test_client_functional.py
@@ -3,8 +3,8 @@ import time
 import pytest
 
 from webob import Request, Response
-from webob.dec import wsgify
 from webob.client import SendRequest
+from webob.dec import wsgify
 
 
 @wsgify
diff --git a/tests/test_compat.py b/tests/test_compat.py
index d07acc4..44554e5 100644
--- a/tests/test_compat.py
+++ b/tests/test_compat.py
@@ -1,8 +1,8 @@
-import unittest
 from io import BytesIO
+import sys
+import unittest
 
 import pytest
-import sys
 
 
 class text_Tests(unittest.TestCase):
diff --git a/tests/test_cookies.py b/tests/test_cookies.py
index 4347bce..f8e9e36 100644
--- a/tests/test_cookies.py
+++ b/tests/test_cookies.py
@@ -1,7 +1,7 @@
-import pytest
-
 from datetime import timedelta
 
+import pytest
+
 from webob import cookies
 from webob.util import text_
 
@@ -756,10 +756,11 @@ class TestSignedCookieProfile(CommonCookieProfile):
 
 
 def serialize(secret, salt, data):
-    import hmac
     import base64
-    import json
     from hashlib import sha1
+    import hmac
+    import json
+
     from webob.util import bytes_
 
     salted_secret = bytes_(salt or "", "utf-8") + bytes_(secret, "utf-8")
diff --git a/tests/test_datetime_utils.py b/tests/test_datetime_utils.py
index c6ed36d..56ffff2 100644
--- a/tests/test_datetime_utils.py
+++ b/tests/test_datetime_utils.py
@@ -3,6 +3,7 @@ import datetime
 from email.utils import formatdate
 
 import pytest
+
 from webob import datetime_utils
 
 
diff --git a/tests/test_descriptors.py b/tests/test_descriptors.py
index f764e0b..a214094 100644
--- a/tests/test_descriptors.py
+++ b/tests/test_descriptors.py
@@ -1,6 +1,7 @@
 from datetime import timedelta, tzinfo
 
 import pytest
+
 from webob.request import Request
 from webob.util import text_
 
@@ -142,8 +143,8 @@ def test_header_getter_doc():
 
 
 def test_header_getter_fget():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -151,8 +152,8 @@ def test_header_getter_fget():
 
 
 def test_header_getter_fset():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -161,8 +162,8 @@ def test_header_getter_fset():
 
 
 def test_header_getter_fset_none():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -172,8 +173,8 @@ def test_header_getter_fset_none():
 
 
 def test_header_getter_fset_text():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -182,8 +183,8 @@ def test_header_getter_fset_text():
 
 
 def test_header_getter_fset_text_control_chars():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -192,8 +193,8 @@ def test_header_getter_fset_text_control_chars():
 
 
 def test_header_getter_fset_non_text():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -202,8 +203,8 @@ def test_header_getter_fset_non_text():
 
 
 def test_header_getter_fdel():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -213,8 +214,8 @@ def test_header_getter_fdel():
 
 
 def test_header_getter_unicode_fget_none():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -222,8 +223,8 @@ def test_header_getter_unicode_fget_none():
 
 
 def test_header_getter_unicode_fget():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -232,8 +233,8 @@ def test_header_getter_unicode_fget():
 
 
 def test_header_getter_unicode_fset_none():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -242,8 +243,8 @@ def test_header_getter_unicode_fset_none():
 
 
 def test_header_getter_unicode_fset():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -252,8 +253,8 @@ def test_header_getter_unicode_fset():
 
 
 def test_header_getter_unicode_fdel():
-    from webob.descriptors import header_getter
     from webob import Response
+    from webob.descriptors import header_getter
 
     resp = Response("aresp")
     desc = header_getter("AHEADER", "14.3")
@@ -263,9 +264,7 @@ def test_header_getter_unicode_fdel():
 
 
 def test_converter_not_prop():
-    from webob.descriptors import converter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import converter, parse_int_safe, serialize_int
 
     with pytest.raises(AssertionError):
         converter(
@@ -274,10 +273,12 @@ def test_converter_not_prop():
 
 
 def test_converter_with_name_docstring():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     desc = converter(
         environ_getter("CONTENT_LENGTH", "666", "14.13"),
@@ -294,10 +295,12 @@ def test_converter_with_name_docstring():
 
 
 def test_converter_with_name_fget():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -310,10 +313,12 @@ def test_converter_with_name_fget():
 
 
 def test_converter_with_name_fset():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -327,10 +332,12 @@ def test_converter_with_name_fset():
 
 
 def test_converter_without_name_fget():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -340,10 +347,12 @@ def test_converter_without_name_fget():
 
 
 def test_converter_without_name_fset():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -354,10 +363,12 @@ def test_converter_without_name_fset():
 
 
 def test_converter_none_for_wrong_type():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -370,10 +381,12 @@ def test_converter_none_for_wrong_type():
 
 
 def test_converter_delete():
-    from webob.descriptors import converter
-    from webob.descriptors import environ_getter
-    from webob.descriptors import parse_int_safe
-    from webob.descriptors import serialize_int
+    from webob.descriptors import (
+        converter,
+        environ_getter,
+        parse_int_safe,
+        serialize_int,
+    )
 
     req = Request.blank("/")
     desc = converter(
@@ -451,8 +464,8 @@ def test_serialize_list_unicode():
 
 def test_converter_date():
     import datetime
-    from webob.descriptors import converter_date
-    from webob.descriptors import environ_getter
+
+    from webob.descriptors import converter_date, environ_getter
 
     req = Request.blank("/")
     UTC = GMT()
@@ -463,8 +476,7 @@ def test_converter_date():
 
 
 def test_converter_date_docstring():
-    from webob.descriptors import converter_date
-    from webob.descriptors import environ_getter
+    from webob.descriptors import converter_date, environ_getter
 
     desc = converter_date(
         environ_getter("HTTP_DATE", "Tue, 15 Nov 1994 08:12:31 GMT", "14.8")
@@ -486,6 +498,7 @@ def test_date_header_fget_none():
 
 def test_date_header_fset_fget():
     import datetime
+
     from webob import Response
     from webob.descriptors import date_header
 
@@ -567,6 +580,7 @@ def test_serialize_if_range_unicode():
 
 def test_serialize_if_range_datetime():
     import datetime
+
     from webob.descriptors import serialize_if_range
 
     UTC = GMT()
diff --git a/tests/test_etag_nose.py b/tests/test_etag_nose.py
index 8a8cd5d..dd0f0cc 100644
--- a/tests/test_etag_nose.py
+++ b/tests/test_etag_nose.py
@@ -1,5 +1,5 @@
-from webob.etag import IfRange, ETagMatcher
 from webob import Response
+from webob.etag import ETagMatcher, IfRange
 
 
 def test_if_range_None():
diff --git a/tests/test_exc.py b/tests/test_exc.py
index ee83774..c1fa721 100644
--- a/tests/test_exc.py
+++ b/tests/test_exc.py
@@ -1,6 +1,7 @@
 import json
 
 import pytest
+
 from webob import exc as webob_exc
 from webob.dec import wsgify
 from webob.request import Request
diff --git a/tests/test_in_wsgiref.py b/tests/test_in_wsgiref.py
index cf8e999..a565b9e 100644
--- a/tests/test_in_wsgiref.py
+++ b/tests/test_in_wsgiref.py
@@ -4,6 +4,7 @@ import socket
 import sys
 
 import pytest
+
 from webob.compat import Empty, Queue, url_open
 from webob.request import Request
 from webob.response import Response
diff --git a/tests/test_misc.py b/tests/test_misc.py
index f9a6bc3..e356f33 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1,4 +1,5 @@
 import pytest
+
 from webob.util import html_escape, text_
 
 
diff --git a/tests/test_multidict.py b/tests/test_multidict.py
index 175e174..1d04bad 100644
--- a/tests/test_multidict.py
+++ b/tests/test_multidict.py
@@ -1,4 +1,5 @@
 import unittest
+
 from webob import multidict
 from webob.util import text_
 
@@ -156,8 +157,9 @@ class BaseDictTests:
 
     def test_from_fieldstorage_with_charset(self):
         from cgi import FieldStorage
-        from webob.request import BaseRequest
+
         from webob.multidict import MultiDict
+        from webob.request import BaseRequest
 
         multipart_type = "multipart/form-data; boundary=foobar"
         from io import BytesIO
@@ -184,8 +186,9 @@ class BaseDictTests:
 
     def test_from_fieldstorage_with_base64_encoding(self):
         from cgi import FieldStorage
-        from webob.request import BaseRequest
+
         from webob.multidict import MultiDict
+        from webob.request import BaseRequest
 
         multipart_type = "multipart/form-data; boundary=foobar"
         from io import BytesIO
@@ -213,8 +216,9 @@ class BaseDictTests:
 
     def test_from_fieldstorage_with_quoted_printable_encoding(self):
         from cgi import FieldStorage
-        from webob.request import BaseRequest
+
         from webob.multidict import MultiDict
+        from webob.request import BaseRequest
 
         multipart_type = "multipart/form-data; boundary=foobar"
         from io import BytesIO
diff --git a/tests/test_request.py b/tests/test_request.py
index 09e0115..294a511 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -1,9 +1,10 @@
-import sys
-import warnings
 from collections.abc import MutableMapping
 from io import BytesIO, StringIO
+import sys
+import warnings
 
 import pytest
+
 from webob.acceptparse import (
     AcceptCharsetInvalidHeader,
     AcceptCharsetNoHeader,
@@ -523,8 +524,8 @@ class TestRequestCommon:
 
     @pytest.mark.parametrize("method", ["POST", "PUT", "PATCH", "DELETE"])
     def test_POST_json_no_content_type(self, method):
-        from webob.request import NoVars
         from webob.multidict import MultiDict
+        from webob.request import NoVars
 
         data = b'{"password": "last centurion", "email": "rory@wiggy.net"}'
         wsgi_input = BytesIO(data)
@@ -673,9 +674,10 @@ class TestRequestCommon:
         assert bool(req.accept_encoding) is False
 
     def test_remove_conditional_headers_if_modified_since(self):
-        from webob.datetime_utils import UTC
         from datetime import datetime
 
+        from webob.datetime_utils import UTC
+
         req = self._blankOne("/")
         req.if_modified_since = datetime(2006, 1, 1, 12, 0, tzinfo=UTC)
         req.remove_conditional_headers()
@@ -1059,8 +1061,9 @@ class TestRequestCommon:
 
     def test_blank__post_files(self):
         import cgi
-        from webob.request import _get_multipart_boundary
+
         from webob.multidict import MultiDict
+        from webob.request import _get_multipart_boundary
 
         POST = MultiDict()
         POST["first"] = ("filename1", BytesIO(b"1"))
@@ -2277,12 +2280,12 @@ class TestRequest_functional:
         assert a.host_url == "http://www.example.com"
         a = self._makeOne(
             {"wsgi.url_scheme": "http"},
-            **{"server_name": "localhost", "server_port": 5000}
+            **{"server_name": "localhost", "server_port": 5000},
         )
         assert a.host_url == "http://localhost:5000"
         a = self._makeOne(
             {"wsgi.url_scheme": "https"},
-            **{"server_name": "localhost", "server_port": 443}
+            **{"server_name": "localhost", "server_port": 443},
         )
         assert a.host_url == "https://localhost"
 
@@ -2663,9 +2666,7 @@ class TestRequest_functional:
         # port from doctest (docs/reference.txt)
 
         # Query & POST variables
-        from webob.multidict import MultiDict
-        from webob.multidict import NestedMultiDict
-        from webob.multidict import GetDict
+        from webob.multidict import GetDict, MultiDict, NestedMultiDict
 
         req = self._blankOne("/test?check=a&check=b&name=Bob")
         GET = GetDict([("check", "a"), ("check", "b"), ("name", "Bob")], {})
@@ -2700,13 +2701,12 @@ class TestRequest_functional:
     @pytest.mark.filterwarnings("ignore:.*best_match.*")
     def test_request_put(self):
         from datetime import datetime
-        from webob import Response
-        from webob import UTC
+
+        from webob import UTC, Response
         from webob.acceptparse import Accept
         from webob.byterange import Range
         from webob.etag import ETagMatcher
-        from webob.multidict import MultiDict
-        from webob.multidict import GetDict
+        from webob.multidict import GetDict, MultiDict
 
         req = self._blankOne("/test?check=a&check=b&name=Bob")
         req.method = "PUT"
@@ -2801,8 +2801,7 @@ class TestRequest_functional:
         assert server_token not in req.if_match
 
     def test_request_patch(self):
-        from webob.multidict import MultiDict
-        from webob.multidict import GetDict
+        from webob.multidict import GetDict, MultiDict
 
         req = self._blankOne("/test?check=a&check=b&name=Bob")
         req.method = "PATCH"
@@ -3025,12 +3024,12 @@ class Test_environ_from_url:
         assert request.upath_info == expected
 
     def test_fileupload_mime_type_detection(self):
-        from webob.request import Request
-
         # sometimes on win the detected mime type for .jpg will be
         # image/pjpeg for ex. so use a non-standard extesion to avoid that
         import mimetypes
 
+        from webob.request import Request
+
         mimetypes.add_type("application/x-foo", ".foo")
         request = Request.blank(
             "/", POST=dict(file1=("foo.foo", "xxx"), file2=("bar.mp3", "xxx"))
@@ -3049,7 +3048,7 @@ def test_environ_add_POST_file_with_content_type():
             self.type_options = type_options or {}
             self.value = value
 
-    from webob.request import environ_from_url, environ_add_POST
+    from webob.request import environ_add_POST, environ_from_url
 
     env = environ_from_url("http://example.com/")
     environ_add_POST(
diff --git a/tests/test_response.py b/tests/test_response.py
index 5fc574b..7f76bbe 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -3,6 +3,7 @@ import sys
 import zlib
 
 import pytest
+
 from webob import cookies
 from webob.request import BaseRequest, Request
 from webob.response import Response
@@ -660,6 +661,7 @@ def test_response_file_body_writelines():
 )
 def test_response_file_body_tell():
     import zipfile
+
     from webob.response import ResponseBodyFile
 
     rbo = ResponseBodyFile(Response())
diff --git a/tests/test_static.py b/tests/test_static.py
index e136586..0d8ad2e 100644
--- a/tests/test_static.py
+++ b/tests/test_static.py
@@ -1,10 +1,10 @@
+from io import BytesIO
 import os
+from os.path import getmtime
 import shutil
 import tempfile
-import unittest
-from io import BytesIO
-from os.path import getmtime
 from time import gmtime
+import unittest
 
 from webob import static
 from webob.request import Request, environ_from_url
diff --git a/tests/test_util.py b/tests/test_util.py
index 67fd05a..3e9b200 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,4 +1,5 @@
 import unittest
+
 from webob.response import Response