From 31cb5cc1478ed8dd6a53930e12c1505d286fc806 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 1 Feb 2021 14:54:30 -0800
Subject: [PATCH] remove external mock from acme

---
 acme/setup.py                   | 11 -----------
 acme/tests/challenges_test.py   |  5 +----
 acme/tests/client_test.py       |  5 +----
 acme/tests/errors_test.py       |  6 +-----
 acme/tests/magic_typing_test.py |  6 +-----
 acme/tests/messages_test.py     |  5 +----
 acme/tests/standalone_test.py   |  5 +----
 7 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/acme/setup.py b/acme/setup.py
index 056b00107..bd6352ed1 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -1,7 +1,5 @@
-from distutils.version import LooseVersion
 import sys
 
-from setuptools import __version__ as setuptools_version
 from setuptools import find_packages
 from setuptools import setup
 
@@ -23,15 +21,6 @@ install_requires = [
     'six>=1.11.0',
 ]
 
-setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('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 70371051c..22e67be3c 100644
--- a/acme/tests/challenges_test.py
+++ b/acme/tests/challenges_test.py
@@ -1,12 +1,9 @@
 """Tests for acme.challenges."""
 import unittest
+from unittest import mock
 
 import josepy as jose
 import OpenSSL
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 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 c84878c42..a1be59056 100644
--- a/acme/tests/client_test.py
+++ b/acme/tests/client_test.py
@@ -4,12 +4,9 @@ import copy
 import datetime
 import json
 import unittest
+from unittest import mock
 
 import josepy as jose
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 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 fb90a3f0d..11c57059c 100644
--- a/acme/tests/errors_test.py
+++ b/acme/tests/errors_test.py
@@ -1,10 +1,6 @@
 """Tests for acme.errors."""
 import unittest
-
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
+from unittest import mock
 
 
 class BadNonceTest(unittest.TestCase):
diff --git a/acme/tests/magic_typing_test.py b/acme/tests/magic_typing_test.py
index 9e4fd29f5..048995916 100644
--- a/acme/tests/magic_typing_test.py
+++ b/acme/tests/magic_typing_test.py
@@ -1,11 +1,7 @@
 """Tests for acme.magic_typing."""
 import sys
 import unittest
-
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
+from unittest import mock
 
 
 class MagicTypingTest(unittest.TestCase):
diff --git a/acme/tests/messages_test.py b/acme/tests/messages_test.py
index 70b05b419..74d1737ec 100644
--- a/acme/tests/messages_test.py
+++ b/acme/tests/messages_test.py
@@ -1,11 +1,8 @@
 """Tests for acme.messages."""
 import unittest
+from unittest import mock
 
 import josepy as jose
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 
 from acme import challenges
 import test_util
diff --git a/acme/tests/standalone_test.py b/acme/tests/standalone_test.py
index 3d068fb46..5bbc2ccce 100644
--- a/acme/tests/standalone_test.py
+++ b/acme/tests/standalone_test.py
@@ -2,12 +2,9 @@
 import socket
 import threading
 import unittest
+from unittest import mock
 
 import josepy as jose
-try:
-    import mock
-except ImportError: # pragma: no cover
-    from unittest import mock # type: ignore
 import requests
 from six.moves import http_client  # pylint: disable=import-error
 from six.moves import socketserver  # type: ignore  # pylint: disable=import-error