Import unittest.mock unconditionally (#2050)

tests/test_arbiter.py

@@ -4,11 +4,7 @@
 # See the NOTICE for more information.
 
 import os
-
+import unittest.mock as mock
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
 
 import gunicorn.app.base
 import gunicorn.arbiter

tests/test_http.py

@@ -3,6 +3,7 @@
 import io
 import t
 import pytest
+import unittest.mock as mock
 
 from gunicorn import util
 from gunicorn.http.body import Body, LengthReader, EOFReader
@@ -10,11 +11,6 @@ from gunicorn.http.wsgi import Response
 from gunicorn.http.unreader import Unreader, IterUnreader, SocketUnreader
 from gunicorn.http.errors import InvalidHeader, InvalidHeaderName
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 
 def assert_readline(payload, size, expected):
     body = Body(io.BytesIO(payload))

tests/test_pidfile.py

@@ -4,11 +4,7 @@
 # See the NOTICE for more information.
 
 import errno
-
+import unittest.mock as mock
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
 
 import gunicorn.pidfile
 

tests/test_sock.py

@@ -3,10 +3,7 @@
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
 
-try:
+import unittest.mock as mock
-    import unittest.mock as mock
-except ImportError:
-    import mock
 
 from gunicorn import sock
 

tests/test_systemd.py

@@ -5,11 +5,7 @@
 
 from contextlib import contextmanager
 import os
-
+import unittest.mock as mock
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
 
 import pytest