From ff732bf97538fe1ab94589d4ddeff294026f3ddd Mon Sep 17 00:00:00 2001 From: ohemorange Date: Mon, 13 Apr 2020 17:09:24 -0700 Subject: [PATCH] Revert the last two mock PRs (#7903) * Revert "Do not require mock in Python 3 in certbot module (#7895)" This reverts commit 77871ba71c05dead938d700fefcfd719646301a1. * Revert "Do not require mock in Python 3 in acme module (#7894)" This reverts commit cd0acf5dcc94263706b08d7f45d741fbc07c9196. --- acme/setup.py | 12 +----------- acme/tests/challenges_test.py | 5 +---- acme/tests/client_test.py | 5 +---- acme/tests/errors_test.py | 5 +---- acme/tests/magic_typing_test.py | 5 +---- acme/tests/messages_test.py | 5 +---- acme/tests/standalone_test.py | 5 +---- certbot/certbot/plugins/dns_test_common.py | 5 +---- certbot/certbot/plugins/dns_test_common_lexicon.py | 5 +---- certbot/certbot/tests/util.py | 5 +---- certbot/setup.py | 12 ++---------- certbot/tests/account_test.py | 5 +---- certbot/tests/auth_handler_test.py | 5 +---- certbot/tests/cert_manager_test.py | 5 +---- certbot/tests/cli_test.py | 5 +---- certbot/tests/client_test.py | 5 +---- certbot/tests/compat/filesystem_test.py | 5 +---- certbot/tests/configuration_test.py | 5 +---- certbot/tests/crypto_util_test.py | 5 +---- certbot/tests/display/completer_test.py | 5 +---- certbot/tests/display/ops_test.py | 5 +---- certbot/tests/display/util_test.py | 5 +---- certbot/tests/eff_test.py | 5 +---- certbot/tests/error_handler_test.py | 5 +---- certbot/tests/errors_test.py | 5 +---- certbot/tests/hook_test.py | 5 +---- certbot/tests/lock_test.py | 5 +---- certbot/tests/log_test.py | 5 +---- certbot/tests/main_test.py | 5 +---- certbot/tests/ocsp_test.py | 5 +---- certbot/tests/plugins/common_test.py | 5 +---- certbot/tests/plugins/disco_test.py | 5 +---- certbot/tests/plugins/dns_common_lexicon_test.py | 5 +---- certbot/tests/plugins/dns_common_test.py | 5 +---- certbot/tests/plugins/enhancements_test.py | 5 +---- certbot/tests/plugins/manual_test.py | 5 +---- certbot/tests/plugins/null_test.py | 5 +---- certbot/tests/plugins/selection_test.py | 5 +---- certbot/tests/plugins/standalone_test.py | 5 +---- certbot/tests/plugins/storage_test.py | 5 +---- certbot/tests/plugins/util_test.py | 5 +---- certbot/tests/plugins/webroot_test.py | 5 +---- certbot/tests/renewal_test.py | 5 +---- certbot/tests/renewupdater_test.py | 5 +---- certbot/tests/reporter_test.py | 5 +---- certbot/tests/reverter_test.py | 5 +---- certbot/tests/storage_test.py | 5 +---- certbot/tests/util_test.py | 5 +---- 48 files changed, 49 insertions(+), 205 deletions(-) diff --git a/acme/setup.py b/acme/setup.py index 356410efe..0527b3fb5 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -1,7 +1,5 @@ -from distutils.version import StrictVersion import sys -from setuptools import __version__ as setuptools_version from setuptools import find_packages from setuptools import setup from setuptools.command.test import test as TestCommand @@ -17,6 +15,7 @@ install_requires = [ # 1.1.0+ is required to avoid the warnings described at # https://github.com/certbot/josepy/issues/13. 'josepy>=1.1.0', + 'mock', # Connection.set_tlsext_host_name (>=0.13) 'PyOpenSSL>=0.13.1', 'pyrfc3339', @@ -27,15 +26,6 @@ install_requires = [ 'six>=1.9.0', # needed for python_2_unicode_compatible ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) -if setuptools_known_environment_markers: - install_requires.append('mock ; python_version < "3.3"') -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' - 'of setuptools. Version 36.2+ of setuptools is required.') -elif sys.version_info < (3,3): - install_requires.append('mock') - dev_extras = [ 'pytest', 'pytest-xdist', diff --git a/acme/tests/challenges_test.py b/acme/tests/challenges_test.py index b6a3d1f83..433c7bb82 100644 --- a/acme/tests/challenges_test.py +++ b/acme/tests/challenges_test.py @@ -3,10 +3,7 @@ import unittest import josepy as jose import OpenSSL -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import requests from six.moves.urllib import parse as urllib_parse diff --git a/acme/tests/client_test.py b/acme/tests/client_test.py index 444737e15..010974a32 100644 --- a/acme/tests/client_test.py +++ b/acme/tests/client_test.py @@ -6,10 +6,7 @@ import json import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import OpenSSL import requests from six.moves import http_client # pylint: disable=import-error diff --git a/acme/tests/errors_test.py b/acme/tests/errors_test.py index 660c122d3..c9c6f484f 100644 --- a/acme/tests/errors_test.py +++ b/acme/tests/errors_test.py @@ -1,10 +1,7 @@ """Tests for acme.errors.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock class BadNonceTest(unittest.TestCase): diff --git a/acme/tests/magic_typing_test.py b/acme/tests/magic_typing_test.py index 43efe8eff..60b4a5df4 100644 --- a/acme/tests/magic_typing_test.py +++ b/acme/tests/magic_typing_test.py @@ -2,10 +2,7 @@ import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock class MagicTypingTest(unittest.TestCase): diff --git a/acme/tests/messages_test.py b/acme/tests/messages_test.py index 9c2955f7e..d36e2cc99 100644 --- a/acme/tests/messages_test.py +++ b/acme/tests/messages_test.py @@ -2,10 +2,7 @@ import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from acme import challenges import test_util diff --git a/acme/tests/standalone_test.py b/acme/tests/standalone_test.py index 7a0f5ddde..8face7c7b 100644 --- a/acme/tests/standalone_test.py +++ b/acme/tests/standalone_test.py @@ -4,10 +4,7 @@ import threading import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import requests from six.moves import http_client # pylint: disable=import-error from six.moves import socketserver # type: ignore # pylint: disable=import-error diff --git a/certbot/certbot/plugins/dns_test_common.py b/certbot/certbot/plugins/dns_test_common.py index d5044d336..9ef76c2c3 100644 --- a/certbot/certbot/plugins/dns_test_common.py +++ b/certbot/certbot/plugins/dns_test_common.py @@ -2,10 +2,7 @@ import configobj import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock # type: ignore +import mock import six from acme import challenges diff --git a/certbot/certbot/plugins/dns_test_common_lexicon.py b/certbot/certbot/plugins/dns_test_common_lexicon.py index 1bef06042..c77d6da9e 100644 --- a/certbot/certbot/plugins/dns_test_common_lexicon.py +++ b/certbot/certbot/plugins/dns_test_common_lexicon.py @@ -1,10 +1,7 @@ """Base test class for DNS authenticators built on Lexicon.""" import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock # type: ignore +import mock from requests.exceptions import HTTPError from requests.exceptions import RequestException diff --git a/certbot/certbot/tests/util.py b/certbot/certbot/tests/util.py index 92f52a852..8b28b1080 100644 --- a/certbot/certbot/tests/util.py +++ b/certbot/certbot/tests/util.py @@ -10,10 +10,7 @@ import unittest from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock # type: ignore +import mock import OpenSSL import pkg_resources import six diff --git a/certbot/setup.py b/certbot/setup.py index 143e1a10a..514aec8c5 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -47,6 +47,7 @@ install_requires = [ # 1.1.0+ is required to avoid the warnings described at # https://github.com/certbot/josepy/issues/13. 'josepy>=1.1.0', + 'mock', 'parsedatetime>=1.3', # Calendar.parseDT 'pyrfc3339', 'pytz', @@ -61,8 +62,7 @@ install_requires = [ # So this dependency is not added for old Linux distributions with old setuptools, # in order to allow these systems to build certbot from sources. pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) -if setuptools_known_environment_markers: +if StrictVersion(setuptools_version) >= StrictVersion('36.2'): install_requires.append(pywin32_req + " ; sys_platform == 'win32'") elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' @@ -73,14 +73,6 @@ elif os.name == 'nt': # setuptools, pywin32 will not be specified as a dependency. install_requires.append(pywin32_req) -if setuptools_known_environment_markers: - install_requires.append('mock ; python_version < "3.3"') -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' - 'of setuptools. Version 36.2+ of setuptools is required.') -elif sys.version_info < (3,3): - install_requires.append('mock') - dev_extras = [ 'coverage', 'ipdb', diff --git a/certbot/tests/account_test.py b/certbot/tests/account_test.py index 6c6e6c860..4a6ed3e01 100644 --- a/certbot/tests/account_test.py +++ b/certbot/tests/account_test.py @@ -4,10 +4,7 @@ import json import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import pytz from acme import messages diff --git a/certbot/tests/auth_handler_test.py b/certbot/tests/auth_handler_test.py index 6cd207b4b..7ab3a2baa 100644 --- a/certbot/tests/auth_handler_test.py +++ b/certbot/tests/auth_handler_test.py @@ -3,10 +3,7 @@ import functools import logging import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import zope.component from acme import challenges diff --git a/certbot/tests/cert_manager_test.py b/certbot/tests/cert_manager_test.py index d956fd04f..bea64f09c 100644 --- a/certbot/tests/cert_manager_test.py +++ b/certbot/tests/cert_manager_test.py @@ -7,10 +7,7 @@ import tempfile import unittest import configobj -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot._internal import configuration diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py index 592c40be7..7d21f8bb8 100644 --- a/certbot/tests/cli_test.py +++ b/certbot/tests/cli_test.py @@ -4,10 +4,7 @@ import copy import tempfile import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from six.moves import reload_module # pylint: disable=import-error diff --git a/certbot/tests/client_test.py b/certbot/tests/client_test.py index cbc058c7a..3e0e5b212 100644 --- a/certbot/tests/client_test.py +++ b/certbot/tests/client_test.py @@ -5,10 +5,7 @@ import tempfile import unittest from josepy import interfaces -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot import util diff --git a/certbot/tests/compat/filesystem_test.py b/certbot/tests/compat/filesystem_test.py index 1c2d2df0d..fdfb1ffe9 100644 --- a/certbot/tests/compat/filesystem_test.py +++ b/certbot/tests/compat/filesystem_test.py @@ -3,10 +3,7 @@ import contextlib import errno import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import util from certbot._internal import lock diff --git a/certbot/tests/configuration_test.py b/certbot/tests/configuration_test.py index 1f8a0e803..d748b9bfb 100644 --- a/certbot/tests/configuration_test.py +++ b/certbot/tests/configuration_test.py @@ -1,10 +1,7 @@ """Tests for certbot._internal.configuration.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot._internal import constants diff --git a/certbot/tests/crypto_util_test.py b/certbot/tests/crypto_util_test.py index 481d83894..d52e3acdb 100644 --- a/certbot/tests/crypto_util_test.py +++ b/certbot/tests/crypto_util_test.py @@ -2,10 +2,7 @@ import logging import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import OpenSSL import zope.component diff --git a/certbot/tests/display/completer_test.py b/certbot/tests/display/completer_test.py index 0852ab175..a183fd14f 100644 --- a/certbot/tests/display/completer_test.py +++ b/certbot/tests/display/completer_test.py @@ -7,10 +7,7 @@ import string import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from six.moves import reload_module # pylint: disable=import-error from certbot.compat import filesystem # pylint: disable=ungrouped-imports diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py index a683e1d3d..327f1bcbe 100644 --- a/certbot/tests/display/ops_test.py +++ b/certbot/tests/display/ops_test.py @@ -4,10 +4,7 @@ import sys import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import zope.component from acme import messages diff --git a/certbot/tests/display/util_test.py b/certbot/tests/display/util_test.py index 3e492e9ab..eccfee7db 100644 --- a/certbot/tests/display/util_test.py +++ b/certbot/tests/display/util_test.py @@ -4,10 +4,7 @@ import socket import tempfile import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from certbot import errors diff --git a/certbot/tests/eff_test.py b/certbot/tests/eff_test.py index c4a25da69..cdd7908a3 100644 --- a/certbot/tests/eff_test.py +++ b/certbot/tests/eff_test.py @@ -1,10 +1,7 @@ """Tests for certbot._internal.eff.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import requests from certbot._internal import constants diff --git a/certbot/tests/error_handler_test.py b/certbot/tests/error_handler_test.py index e5a95c3a8..899dbc611 100644 --- a/certbot/tests/error_handler_test.py +++ b/certbot/tests/error_handler_test.py @@ -4,10 +4,7 @@ import signal import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot.compat import os diff --git a/certbot/tests/errors_test.py b/certbot/tests/errors_test.py index 792868df0..d6c829322 100644 --- a/certbot/tests/errors_test.py +++ b/certbot/tests/errors_test.py @@ -1,10 +1,7 @@ """Tests for certbot.errors.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from acme import messages from certbot import achallenges diff --git a/certbot/tests/hook_test.py b/certbot/tests/hook_test.py index 32081f9d0..3b7a94489 100644 --- a/certbot/tests/hook_test.py +++ b/certbot/tests/hook_test.py @@ -1,10 +1,7 @@ """Tests for certbot._internal.hooks.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot import util diff --git a/certbot/tests/lock_test.py b/certbot/tests/lock_test.py index 2f887d33e..5a48009fd 100644 --- a/certbot/tests/lock_test.py +++ b/certbot/tests/lock_test.py @@ -3,10 +3,7 @@ import functools import multiprocessing import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot.compat import os diff --git a/certbot/tests/log_test.py b/certbot/tests/log_test.py index 5cd287c2e..5b0918ce5 100644 --- a/certbot/tests/log_test.py +++ b/certbot/tests/log_test.py @@ -5,10 +5,7 @@ import sys import time import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from acme import messages diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index 8113b2bc4..92afc3fef 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -13,10 +13,7 @@ import traceback import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import pytz import six from six.moves import reload_module # pylint: disable=import-error diff --git a/certbot/tests/ocsp_test.py b/certbot/tests/ocsp_test.py index af54844cf..9eb49e115 100644 --- a/certbot/tests/ocsp_test.py +++ b/certbot/tests/ocsp_test.py @@ -10,10 +10,7 @@ from cryptography.exceptions import InvalidSignature from cryptography.exceptions import UnsupportedAlgorithm from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes # type: ignore -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import pytz from certbot import errors diff --git a/certbot/tests/plugins/common_test.py b/certbot/tests/plugins/common_test.py index 344e6312f..1f339a6f3 100644 --- a/certbot/tests/plugins/common_test.py +++ b/certbot/tests/plugins/common_test.py @@ -4,10 +4,7 @@ import shutil import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from acme import challenges from certbot import achallenges diff --git a/certbot/tests/plugins/disco_test.py b/certbot/tests/plugins/disco_test.py index 5a0a392b0..eec0795e3 100644 --- a/certbot/tests/plugins/disco_test.py +++ b/certbot/tests/plugins/disco_test.py @@ -3,10 +3,7 @@ import functools import string import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import pkg_resources import six import zope.interface diff --git a/certbot/tests/plugins/dns_common_lexicon_test.py b/certbot/tests/plugins/dns_common_lexicon_test.py index a67430f3e..986362ca9 100644 --- a/certbot/tests/plugins/dns_common_lexicon_test.py +++ b/certbot/tests/plugins/dns_common_lexicon_test.py @@ -2,10 +2,7 @@ import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot.plugins import dns_common_lexicon from certbot.plugins import dns_test_common_lexicon diff --git a/certbot/tests/plugins/dns_common_test.py b/certbot/tests/plugins/dns_common_test.py index 993f3b461..eba3c89d6 100644 --- a/certbot/tests/plugins/dns_common_test.py +++ b/certbot/tests/plugins/dns_common_test.py @@ -4,10 +4,7 @@ import collections import logging import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot import util diff --git a/certbot/tests/plugins/enhancements_test.py b/certbot/tests/plugins/enhancements_test.py index a20a6864f..05fbc5028 100644 --- a/certbot/tests/plugins/enhancements_test.py +++ b/certbot/tests/plugins/enhancements_test.py @@ -1,10 +1,7 @@ """Tests for new style enhancements""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot._internal.plugins import null from certbot.plugins import enhancements diff --git a/certbot/tests/plugins/manual_test.py b/certbot/tests/plugins/manual_test.py index 933c759d6..6cdef148a 100644 --- a/certbot/tests/plugins/manual_test.py +++ b/certbot/tests/plugins/manual_test.py @@ -2,10 +2,7 @@ import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from acme import challenges diff --git a/certbot/tests/plugins/null_test.py b/certbot/tests/plugins/null_test.py index 47708e340..db0213813 100644 --- a/certbot/tests/plugins/null_test.py +++ b/certbot/tests/plugins/null_test.py @@ -1,10 +1,7 @@ """Tests for certbot._internal.plugins.null.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six diff --git a/certbot/tests/plugins/selection_test.py b/certbot/tests/plugins/selection_test.py index e5e6db031..c66473ad1 100644 --- a/certbot/tests/plugins/selection_test.py +++ b/certbot/tests/plugins/selection_test.py @@ -2,10 +2,7 @@ import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import zope.component from certbot import errors diff --git a/certbot/tests/plugins/standalone_test.py b/certbot/tests/plugins/standalone_test.py index 751b9d943..862accb92 100644 --- a/certbot/tests/plugins/standalone_test.py +++ b/certbot/tests/plugins/standalone_test.py @@ -5,10 +5,7 @@ from socket import errno as socket_errors # type: ignore import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import OpenSSL.crypto # pylint: disable=unused-import import six diff --git a/certbot/tests/plugins/storage_test.py b/certbot/tests/plugins/storage_test.py index 4b0d1da83..e9ca2007f 100644 --- a/certbot/tests/plugins/storage_test.py +++ b/certbot/tests/plugins/storage_test.py @@ -2,10 +2,7 @@ import json import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import errors from certbot.compat import filesystem diff --git a/certbot/tests/plugins/util_test.py b/certbot/tests/plugins/util_test.py index 9387b4ae7..c41e55222 100644 --- a/certbot/tests/plugins/util_test.py +++ b/certbot/tests/plugins/util_test.py @@ -1,10 +1,7 @@ """Tests for certbot.plugins.util.""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot.compat import os diff --git a/certbot/tests/plugins/webroot_test.py b/certbot/tests/plugins/webroot_test.py index e57e09eae..fade12bb1 100644 --- a/certbot/tests/plugins/webroot_test.py +++ b/certbot/tests/plugins/webroot_test.py @@ -10,10 +10,7 @@ import tempfile import unittest import josepy as jose -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from acme import challenges diff --git a/certbot/tests/renewal_test.py b/certbot/tests/renewal_test.py index 1fc54b42e..e92211ea2 100644 --- a/certbot/tests/renewal_test.py +++ b/certbot/tests/renewal_test.py @@ -1,10 +1,7 @@ """Tests for certbot._internal.renewal""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from acme import challenges from certbot import errors diff --git a/certbot/tests/renewupdater_test.py b/certbot/tests/renewupdater_test.py index b5ecddb5a..c6f8f3713 100644 --- a/certbot/tests/renewupdater_test.py +++ b/certbot/tests/renewupdater_test.py @@ -1,10 +1,7 @@ """Tests for renewal updater interfaces""" import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock from certbot import interfaces from certbot._internal import main diff --git a/certbot/tests/reporter_test.py b/certbot/tests/reporter_test.py index 7d03f1821..3d7c80172 100644 --- a/certbot/tests/reporter_test.py +++ b/certbot/tests/reporter_test.py @@ -2,10 +2,7 @@ import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six diff --git a/certbot/tests/reverter_test.py b/certbot/tests/reverter_test.py index d67aa431a..e592bcbdc 100644 --- a/certbot/tests/reverter_test.py +++ b/certbot/tests/reverter_test.py @@ -5,10 +5,7 @@ import shutil import tempfile import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from certbot import errors diff --git a/certbot/tests/storage_test.py b/certbot/tests/storage_test.py index 5aa37824d..0f7620b78 100644 --- a/certbot/tests/storage_test.py +++ b/certbot/tests/storage_test.py @@ -6,10 +6,7 @@ import stat import unittest import configobj -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import pytz import six diff --git a/certbot/tests/util_test.py b/certbot/tests/util_test.py index 6dd0f964c..3ff09a83f 100644 --- a/certbot/tests/util_test.py +++ b/certbot/tests/util_test.py @@ -4,10 +4,7 @@ import errno import sys import unittest -try: - import mock -except ImportError: # pragma: no cover - from unittest import mock +import mock import six from six.moves import reload_module # pylint: disable=import-error