From b15712924f39ed4ab54205fa3bcb41059bf8c849 Mon Sep 17 00:00:00 2001
From: Masashi SHIBATA <c-bata@users.noreply.github.com>
Date: Tue, 28 May 2019 22:09:44 +0900
Subject: [PATCH] Import unittest.mock unconditionally (#2050)

---
 tests/test_arbiter.py | 6 +-----
 tests/test_http.py    | 6 +-----
 tests/test_pidfile.py | 6 +-----
 tests/test_sock.py    | 5 +----
 tests/test_systemd.py | 6 +-----
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/tests/test_arbiter.py b/tests/test_arbiter.py
index bfd9fe65..dc059edb 100644
--- a/tests/test_arbiter.py
+++ b/tests/test_arbiter.py
@@ -4,11 +4,7 @@
 # See the NOTICE for more information.
 
 import os
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 import gunicorn.app.base
 import gunicorn.arbiter
diff --git a/tests/test_http.py b/tests/test_http.py
index 6bcb5f09..33481266 100644
--- a/tests/test_http.py
+++ b/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))
diff --git a/tests/test_pidfile.py b/tests/test_pidfile.py
index e8c07567..fdcd0a24 100644
--- a/tests/test_pidfile.py
+++ b/tests/test_pidfile.py
@@ -4,11 +4,7 @@
 # See the NOTICE for more information.
 
 import errno
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 import gunicorn.pidfile
 
diff --git a/tests/test_sock.py b/tests/test_sock.py
index f70ae09e..36205d84 100644
--- a/tests/test_sock.py
+++ b/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
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from gunicorn import sock
 
diff --git a/tests/test_systemd.py b/tests/test_systemd.py
index 4a7a0d7b..d2c78aa2 100644
--- a/tests/test_systemd.py
+++ b/tests/test_systemd.py
@@ -5,11 +5,7 @@
 
 from contextlib import contextmanager
 import os
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 import pytest