Revert the last two mock PRs (#7903)

* Revert "Do not require mock in Python 3 in certbot module (#7895)"

This reverts commit 77871ba71c.

* Revert "Do not require mock in Python 3 in acme module (#7894)"

This reverts commit cd0acf5dcc.

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',

acme/tests/challenges_test.py

@@ -3,10 +3,7 @@ import unittest
 
 import josepy as jose
 import OpenSSL
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import requests
 from six.moves.urllib import parse as urllib_parse
 

acme/tests/client_test.py

@@ -6,10 +6,7 @@ import json
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import OpenSSL
 import requests
 from six.moves import http_client  # pylint: disable=import-error

acme/tests/errors_test.py

@@ -1,10 +1,7 @@
 """Tests for acme.errors."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 
 class BadNonceTest(unittest.TestCase):

acme/tests/magic_typing_test.py

@@ -2,10 +2,7 @@
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 
 class MagicTypingTest(unittest.TestCase):

acme/tests/messages_test.py

@@ -2,10 +2,7 @@
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from acme import challenges
 import test_util

acme/tests/standalone_test.py

@@ -4,10 +4,7 @@ import threading
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest 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

certbot/certbot/plugins/dns_test_common.py

@@ -2,10 +2,7 @@
 
 import configobj
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 import six
 
 from acme import challenges

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
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 from requests.exceptions import HTTPError
 from requests.exceptions import RequestException
 

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
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 import OpenSSL
 import pkg_resources
 import six

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 StrictVersion(setuptools_version) >= StrictVersion('36.2'):
-if setuptools_known_environment_markers:
     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',

certbot/tests/account_test.py

@@ -4,10 +4,7 @@ import json
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import pytz
 
 from acme import messages

certbot/tests/auth_handler_test.py

@@ -3,10 +3,7 @@ import functools
 import logging
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import zope.component
 
 from acme import challenges

certbot/tests/cert_manager_test.py

@@ -7,10 +7,7 @@ import tempfile
 import unittest
 
 import configobj
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot._internal import configuration

certbot/tests/cli_test.py

@@ -4,10 +4,7 @@ import copy
 import tempfile
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 from six.moves import reload_module  # pylint: disable=import-error
 

certbot/tests/client_test.py

@@ -5,10 +5,7 @@ import tempfile
 import unittest
 
 from josepy import interfaces
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot import util

certbot/tests/compat/filesystem_test.py

@@ -3,10 +3,7 @@ import contextlib
 import errno
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import util
 from certbot._internal import lock

certbot/tests/configuration_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot._internal.configuration."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot._internal import constants

certbot/tests/crypto_util_test.py

@@ -2,10 +2,7 @@
 import logging
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import OpenSSL
 import zope.component
 

certbot/tests/display/completer_test.py

@@ -7,10 +7,7 @@ import string
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 from six.moves import reload_module  # pylint: disable=import-error
 
 from certbot.compat import filesystem  # pylint: disable=ungrouped-imports

certbot/tests/display/ops_test.py

@@ -4,10 +4,7 @@ import sys
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import zope.component
 
 from acme import messages

certbot/tests/display/util_test.py

@@ -4,10 +4,7 @@ import socket
 import tempfile
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 from certbot import errors

certbot/tests/eff_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot._internal.eff."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import requests
 
 from certbot._internal import constants

certbot/tests/error_handler_test.py

@@ -4,10 +4,7 @@ import signal
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot.compat import os
 

certbot/tests/errors_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot.errors."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from acme import messages
 from certbot import achallenges

certbot/tests/hook_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot._internal.hooks."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot import util

certbot/tests/lock_test.py

@@ -3,10 +3,7 @@ import functools
 import multiprocessing
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot.compat import os

certbot/tests/log_test.py

@@ -5,10 +5,7 @@ import sys
 import time
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 from acme import messages

certbot/tests/main_test.py

@@ -13,10 +13,7 @@ import traceback
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import pytz
 import six
 from six.moves import reload_module  # pylint: disable=import-error

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
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import pytz
 
 from certbot import errors

certbot/tests/plugins/common_test.py

@@ -4,10 +4,7 @@ import shutil
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from acme import challenges
 from certbot import achallenges

certbot/tests/plugins/disco_test.py

@@ -3,10 +3,7 @@ import functools
 import string
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import pkg_resources
 import six
 import zope.interface

certbot/tests/plugins/dns_common_lexicon_test.py

@@ -2,10 +2,7 @@
 
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot.plugins import dns_common_lexicon
 from certbot.plugins import dns_test_common_lexicon

certbot/tests/plugins/dns_common_test.py

@@ -4,10 +4,7 @@ import collections
 import logging
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot import util

certbot/tests/plugins/enhancements_test.py

@@ -1,10 +1,7 @@
 """Tests for new style enhancements"""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot._internal.plugins import null
 from certbot.plugins import enhancements

certbot/tests/plugins/manual_test.py

@@ -2,10 +2,7 @@
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 from acme import challenges

certbot/tests/plugins/null_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot._internal.plugins.null."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 

certbot/tests/plugins/selection_test.py

@@ -2,10 +2,7 @@
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import zope.component
 
 from certbot import errors

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
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import OpenSSL.crypto  # pylint: disable=unused-import
 import six
 

certbot/tests/plugins/storage_test.py

@@ -2,10 +2,7 @@
 import json
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import errors
 from certbot.compat import filesystem

certbot/tests/plugins/util_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot.plugins.util."""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot.compat import os
 

certbot/tests/plugins/webroot_test.py

@@ -10,10 +10,7 @@ import tempfile
 import unittest
 
 import josepy as jose
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 from acme import challenges

certbot/tests/renewal_test.py

@@ -1,10 +1,7 @@
 """Tests for certbot._internal.renewal"""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from acme import challenges
 from certbot import errors

certbot/tests/renewupdater_test.py

@@ -1,10 +1,7 @@
 """Tests for renewal updater interfaces"""
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 
 from certbot import interfaces
 from certbot._internal import main

certbot/tests/reporter_test.py

@@ -2,10 +2,7 @@
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 

certbot/tests/reverter_test.py

@@ -5,10 +5,7 @@ import shutil
 import tempfile
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 
 from certbot import errors

certbot/tests/storage_test.py

@@ -6,10 +6,7 @@ import stat
 import unittest
 
 import configobj
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import pytz
 import six
 

certbot/tests/util_test.py

@@ -4,10 +4,7 @@ import errno
 import sys
 import unittest
 
-try:
+import mock
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock
 import six
 from six.moves import reload_module  # pylint: disable=import-error