Deprecate acme.typing_magic module, stop using it in certbot (#8643)

* Deprecate acme.magic_typing, stop to use it in certbot

* Isort

* Add a changelog entry

Co-authored-by: Brad Warren <bmw@users.noreply.github.com>

acme/acme/challenges.py

@@ -8,14 +8,15 @@ import socket
 
 from cryptography.hazmat.primitives import hashes  # type: ignore
 import josepy as jose
-import requests
-from OpenSSL import SSL  # type: ignore # https://github.com/python/typeshed/issues/2052
 from OpenSSL import crypto
+from OpenSSL import SSL  # type: ignore # https://github.com/python/typeshed/issues/2052
+import requests
 
 from acme import crypto_util
 from acme import errors
 from acme import fields
-from acme.mixins import ResourceMixin, TypeMixin
+from acme.mixins import ResourceMixin
+from acme.mixins import TypeMixin
 
 logger = logging.getLogger(__name__)
 

acme/acme/client.py

@@ -8,6 +8,10 @@ import http.client as http_client
 import logging
 import re
 import time
+from typing import Dict
+from typing import List
+from typing import Set
+from typing import Text
 
 import josepy as jose
 import OpenSSL
@@ -20,10 +24,6 @@ from acme import crypto_util
 from acme import errors
 from acme import jws
 from acme import messages
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Set
-from acme.magic_typing import Text
 from acme.mixins import VersionedLEACMEMixin
 
 logger = logging.getLogger(__name__)

acme/acme/crypto_util.py

@@ -5,15 +5,15 @@ import logging
 import os
 import re
 import socket
+from typing import Callable
+from typing import Tuple
+from typing import Union
 
 import josepy as jose
 from OpenSSL import crypto
 from OpenSSL import SSL  # type: ignore # https://github.com/python/typeshed/issues/2052
 
 from acme import errors
-from acme.magic_typing import Callable
-from acme.magic_typing import Tuple
-from acme.magic_typing import Union
 
 logger = logging.getLogger(__name__)
 

acme/acme/magic_typing.py

@@ -4,9 +4,12 @@ This was useful when this code supported Python 2 and typing wasn't always
 available. This code is being kept for now for backwards compatibility.
 
 """
+import warnings
 from typing import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from typing import Collection, IO  # type: ignore
 
+warnings.warn("acme.magic_typing is deprecated and will be removed in a future release.",
+              DeprecationWarning)
 
 class TypingClass:
     """Ignore import errors by getting anything"""

acme/acme/standalone.py

@@ -7,10 +7,10 @@ import logging
 import socket
 import socketserver
 import threading
+from typing import List
 
 from acme import challenges
 from acme import crypto_util
-from acme.magic_typing import List
 
 logger = logging.getLogger(__name__)
 

acme/tests/magic_typing_test.py

@@ -1,6 +1,7 @@
 """Tests for acme.magic_typing."""
 import sys
 import unittest
+import warnings
 from unittest import mock
 
 
@@ -9,15 +10,17 @@ class MagicTypingTest(unittest.TestCase):
     def test_import_success(self):
         try:
             import typing as temp_typing
-        except ImportError: # pragma: no cover
+        except ImportError:  # pragma: no cover
-            temp_typing = None # pragma: no cover
+            temp_typing = None  # pragma: no cover
         typing_class_mock = mock.MagicMock()
         text_mock = mock.MagicMock()
         typing_class_mock.Text = text_mock
         sys.modules['typing'] = typing_class_mock
         if 'acme.magic_typing' in sys.modules:
-            del sys.modules['acme.magic_typing'] # pragma: no cover
+            del sys.modules['acme.magic_typing']  # pragma: no cover
-        from acme.magic_typing import Text
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            from acme.magic_typing import Text
         self.assertEqual(Text, text_mock)
         del sys.modules['acme.magic_typing']
         sys.modules['typing'] = temp_typing

certbot-apache/certbot_apache/_internal/apache_util.py

@@ -9,7 +9,6 @@ import pkg_resources
 
 from certbot import errors
 from certbot import util
-
 from certbot.compat import os
 
 logger = logging.getLogger(__name__)

certbot-apache/certbot_apache/_internal/assertions.py

@@ -3,7 +3,6 @@ import fnmatch
 
 from certbot_apache._internal import interfaces
 
-
 PASS = "CERTBOT_PASS_ASSERT"
 
 

certbot-apache/certbot_apache/_internal/augeasparser.py

@@ -64,10 +64,10 @@ Translates over to:
     "/files/etc/apache2/apache2.conf/bLoCk[1]",
 ]
 """
-from acme.magic_typing import Set
+from typing import Set
+
 from certbot import errors
 from certbot.compat import os
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import assertions
 from certbot_apache._internal import interfaces

certbot-apache/certbot_apache/_internal/configurator.py

@@ -1,13 +1,18 @@
 """Apache Configurator."""
 # pylint: disable=too-many-lines
 from collections import defaultdict
-from distutils.version import LooseVersion
 import copy
+from distutils.version import LooseVersion
 import fnmatch
 import logging
 import re
 import socket
 import time
+from typing import DefaultDict
+from typing import Dict
+from typing import List
+from typing import Set
+from typing import Union
 
 import zope.component
 import zope.interface
@@ -18,11 +23,6 @@ except ImportError:  # pragma: no cover
     HAS_APACHECONFIG = False
 
 from acme import challenges
-from acme.magic_typing import DefaultDict
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Set
-from acme.magic_typing import Union
 from certbot import errors
 from certbot import interfaces
 from certbot import util
@@ -41,6 +41,7 @@ from certbot_apache._internal import http_01
 from certbot_apache._internal import obj
 from certbot_apache._internal import parser
 
+
 logger = logging.getLogger(__name__)
 
 

certbot-apache/certbot_apache/_internal/dualparser.py

@@ -1,7 +1,7 @@
 """ Dual ParserNode implementation """
+from certbot_apache._internal import apacheparser
 from certbot_apache._internal import assertions
 from certbot_apache._internal import augeasparser
-from certbot_apache._internal import apacheparser
 
 
 class DualNodeBase:

certbot-apache/certbot_apache/_internal/http_01.py

@@ -1,9 +1,9 @@
 """A class that performs HTTP-01 challenges for Apache"""
-import logging
 import errno
+import logging
+from typing import List
+from typing import Set
 
-from acme.magic_typing import List
-from acme.magic_typing import Set
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os

certbot-apache/certbot_apache/_internal/interfaces.py

@@ -102,7 +102,6 @@ For this reason the internal representation of data should not ignore the case.
 import abc
 
 
-
 class ParserNode(object, metaclass=abc.ABCMeta):
     """
     ParserNode is the basic building block of the tree of such nodes,

certbot-apache/certbot_apache/_internal/obj.py

@@ -1,7 +1,7 @@
 """Module contains classes used by the Apache Configurator."""
 import re
+from typing import Set
 
-from acme.magic_typing import Set
 from certbot.plugins import common
 
 

certbot-apache/certbot_apache/_internal/override_centos.py

@@ -1,9 +1,9 @@
 """ Distribution specific override class for CentOS family (RHEL, Fedora) """
 import logging
+from typing import List
 
 import zope.interface
 
-from acme.magic_typing import List
 from certbot import errors
 from certbot import interfaces
 from certbot import util

certbot-apache/certbot_apache/_internal/parser.py

@@ -3,9 +3,10 @@ import copy
 import fnmatch
 import logging
 import re
+from typing import Dict
+from typing import List
+
 
-from acme.magic_typing import Dict
-from acme.magic_typing import List
 from certbot import errors
 from certbot.compat import os
 from certbot_apache._internal import apache_util

certbot-ci/certbot_integration_tests/nginx_tests/test_main.py

@@ -1,8 +1,8 @@
 """Module executing integration tests against certbot with nginx plugin."""
 import os
 import ssl
-
 from typing import List
+
 import pytest
 
 from certbot_integration_tests.nginx_tests import context as nginx_context

certbot-ci/certbot_integration_tests/rfc2136_tests/context.py

@@ -1,7 +1,7 @@
 """Module to handle the context of RFC2136 integration tests."""
 
-import tempfile
 from contextlib import contextmanager
+import tempfile
 
 from pkg_resources import resource_filename
 from pytest import skip

certbot-ci/certbot_integration_tests/utils/acme_server.py

@@ -11,14 +11,14 @@ import subprocess
 import sys
 import tempfile
 import time
-
 from typing import List
+
 import requests
 
+# pylint: disable=wildcard-import,unused-wildcard-import
 from certbot_integration_tests.utils import misc
 from certbot_integration_tests.utils import pebble_artifacts
 from certbot_integration_tests.utils import proxy
-# pylint: disable=wildcard-import,unused-wildcard-import
 from certbot_integration_tests.utils.constants import *
 
 

certbot-ci/certbot_integration_tests/utils/misc.py

@@ -26,8 +26,8 @@ from OpenSSL import crypto
 import pkg_resources
 import requests
 
-from certbot_integration_tests.utils.constants import \
+from certbot_integration_tests.utils.constants import PEBBLE_ALTERNATE_ROOTS
-     PEBBLE_ALTERNATE_ROOTS, PEBBLE_MANAGEMENT_URL
+from certbot_integration_tests.utils.constants import PEBBLE_MANAGEMENT_URL
 
 RSA_KEY_TYPE = 'rsa'
 ECDSA_KEY_TYPE = 'ecdsa'

certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py

@@ -7,7 +7,8 @@ import stat
 import pkg_resources
 import requests
 
-from certbot_integration_tests.utils.constants import DEFAULT_HTTP_01_PORT, MOCK_OCSP_SERVER_PORT
+from certbot_integration_tests.utils.constants import DEFAULT_HTTP_01_PORT
+from certbot_integration_tests.utils.constants import MOCK_OCSP_SERVER_PORT
 
 PEBBLE_VERSION = 'v2.3.0'
 ASSETS_PATH = pkg_resources.resource_filename('certbot_integration_tests', 'assets')

certbot-ci/snap_integration_tests/dns_tests/test_main.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
-import pytest
-import subprocess
 import glob
 import os
 import re
+import subprocess
+
+import pytest
 
 
 @pytest.fixture(autouse=True, scope="module")

certbot-ci/windows_installer_integration_tests/test_main.py

@@ -1,8 +1,8 @@
 import os
+import re
+import subprocess
 import time
 import unittest
-import subprocess
-import re
 
 
 @unittest.skipIf(os.name != 'nt', reason='Windows installer tests must be run on Windows.')

certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py

@@ -2,10 +2,10 @@
 import os
 import shutil
 import subprocess
+from typing import Set
 
 import zope.interface
 
-from acme.magic_typing import Set
 from certbot._internal import configuration
 from certbot_compatibility_test import errors
 from certbot_compatibility_test import interfaces

certbot-compatibility-test/certbot_compatibility_test/test_driver.py

@@ -8,6 +8,8 @@ import shutil
 import sys
 import tempfile
 import time
+from typing import List
+from typing import Tuple
 
 import OpenSSL
 from urllib3.util import connection
@@ -15,8 +17,6 @@ from urllib3.util import connection
 from acme import challenges
 from acme import crypto_util
 from acme import messages
-from acme.magic_typing import List
-from acme.magic_typing import Tuple
 from certbot import achallenges
 from certbot import errors as le_errors
 from certbot.tests import acme_util

certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py

@@ -1,13 +1,12 @@
 """DNS Authenticator for Cloudflare."""
 import logging
+from typing import Any
+from typing import Dict
+from typing import List
 
 import CloudFlare
 import zope.interface
 
-from acme.magic_typing import Any
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-
 from certbot import errors
 from certbot import interfaces
 from certbot.plugins import dns_common

certbot-dns-route53/certbot_dns_route53/_internal/dns_route53.py

@@ -2,15 +2,15 @@
 import collections
 import logging
 import time
+from typing import DefaultDict
+from typing import Dict
+from typing import List
 
 import boto3
 from botocore.exceptions import ClientError
 from botocore.exceptions import NoCredentialsError
 import zope.interface
 
-from acme.magic_typing import DefaultDict
-from acme.magic_typing import Dict
-from acme.magic_typing import List
 from certbot import errors
 from certbot import interfaces
 from certbot.plugins import dns_common

certbot-nginx/certbot_nginx/_internal/configurator.py

@@ -7,6 +7,12 @@ import socket
 import subprocess
 import tempfile
 import time
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Set
+from typing import Text
+from typing import Tuple
 
 import OpenSSL
 import pkg_resources
@@ -14,12 +20,6 @@ import zope.interface
 
 from acme import challenges
 from acme import crypto_util as acme_crypto_util
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Optional
-from acme.magic_typing import Set
-from acme.magic_typing import Text
-from acme.magic_typing import Tuple
 from certbot import crypto_util
 from certbot import errors
 from certbot import interfaces

certbot-nginx/certbot_nginx/_internal/constants.py

@@ -1,8 +1,7 @@
 """nginx plugin constants."""
 import platform
-
+from typing import Any
-from acme.magic_typing import Any
+from typing import Dict
-from acme.magic_typing import Dict
 
 FREEBSD_DARWIN_SERVER_ROOT = "/usr/local/etc/nginx"
 LINUX_SERVER_ROOT = "/etc/nginx"

certbot-nginx/certbot_nginx/_internal/http_01.py

@@ -2,10 +2,10 @@
 
 import io
 import logging
+from typing import List
+from typing import Optional
 
 from acme import challenges
-from acme.magic_typing import List
-from acme.magic_typing import Optional
 from certbot import achallenges
 from certbot import errors
 from certbot.compat import os

certbot-nginx/certbot_nginx/_internal/nginxparser.py

@@ -2,6 +2,8 @@
 # Forked from https://github.com/fatiherikli/nginxparser (MIT Licensed)
 import copy
 import logging
+from typing import Any  # pylint: disable=unused-import
+from typing import IO  # pylint: disable=unused-import
 
 from pyparsing import Combine
 from pyparsing import Forward
@@ -15,7 +17,6 @@ from pyparsing import restOfLine
 from pyparsing import stringEnd
 from pyparsing import White
 from pyparsing import ZeroOrMore
-from acme.magic_typing import IO, Any # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)
 

certbot-nginx/certbot_nginx/_internal/parser.py

@@ -5,15 +5,15 @@ import glob
 import io
 import logging
 import re
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Set
+from typing import Tuple
+from typing import Union
 
 import pyparsing
 
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Optional
-from acme.magic_typing import Set
-from acme.magic_typing import Tuple
-from acme.magic_typing import Union
 from certbot import errors
 from certbot.compat import os
 from certbot_nginx._internal import nginxparser

certbot-nginx/certbot_nginx/_internal/parser_obj.py

@@ -3,9 +3,9 @@ raw lists of tokens from pyparsing. """
 
 import abc
 import logging
+from typing import List
 
 
-from acme.magic_typing import List
 from certbot import errors
 
 logger = logging.getLogger(__name__)

certbot/CHANGELOG.md

@@ -11,6 +11,8 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
 ### Changed
 
 * certbot-auto no longer checks for updates on any operating system.
+* The module `acme.magic_typing` is deprecated and will be removed in a future release.
+  Please use the built-in module `typing` instead.
 * The DigitalOcean plugin now creates TXT records for the DNS-01 challenge with a lower 30s TTL.
 
 ### Fixed

certbot/certbot/_internal/account.py

@@ -18,8 +18,8 @@ from certbot import errors
 from certbot import interfaces
 from certbot import util
 from certbot._internal import constants
-from certbot.compat import os
 from certbot.compat import filesystem
+from certbot.compat import os
 
 logger = logging.getLogger(__name__)
 

certbot/certbot/_internal/auth_handler.py

@@ -2,15 +2,15 @@
 import datetime
 import logging
 import time
+from typing import Dict
+from typing import List
+from typing import Tuple
 
 import zope.component
 
 from acme import challenges
 from acme import errors as acme_errors
 from acme import messages
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Tuple
 from certbot import achallenges
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/cert_manager.py

@@ -3,11 +3,11 @@ import datetime
 import logging
 import re
 import traceback
+from typing import List
 
 import pytz
 import zope.component
 
-from acme.magic_typing import List
 from certbot import crypto_util
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/cli/__init__.py

@@ -4,11 +4,11 @@ import logging
 import logging.handlers
 import argparse
 import sys
+from typing import Optional
+
 import certbot._internal.plugins.selection as plugin_selection
 from certbot._internal.plugins import disco as plugins_disco
 
-from acme.magic_typing import Optional
-
 # pylint: disable=ungrouped-imports
 import certbot
 from certbot._internal import constants

certbot/certbot/_internal/cli/cli_utils.py

@@ -5,11 +5,11 @@ import copy
 import zope.interface.interface  # pylint: disable=unused-import
 
 from acme import challenges
+from certbot import errors
 from certbot import interfaces
 from certbot import util
-from certbot import errors
-from certbot.compat import os
 from certbot._internal import constants
+from certbot.compat import os
 
 
 class _Default:

certbot/certbot/_internal/cli/helpful.py

@@ -5,6 +5,8 @@ import copy
 import functools
 import glob
 import sys
+from typing import Any
+from typing import Dict
 
 import configargparse
 import zope.component
@@ -12,8 +14,6 @@ import zope.interface
 
 from zope.interface import interfaces as zope_interfaces
 
-from acme.magic_typing import Any, Dict
-
 from certbot import crypto_util
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/client.py

@@ -2,6 +2,8 @@
 import datetime
 import logging
 import platform
+from typing import List
+from typing import Optional
 
 from cryptography.hazmat.backends import default_backend
 # See https://github.com/pyca/cryptography/issues/4275
@@ -14,8 +16,6 @@ from acme import client as acme_client
 from acme import crypto_util as acme_crypto_util
 from acme import errors as acme_errors
 from acme import messages
-from acme.magic_typing import List
-from acme.magic_typing import Optional
 import certbot
 from certbot import crypto_util
 from certbot import errors

certbot/certbot/_internal/eff.py

@@ -1,16 +1,15 @@
 """Subscribes users to the EFF newsletter."""
 import logging
+from typing import Optional  # pylint: disable=unused-import
 
 import requests
 import zope.component
 
-from acme.magic_typing import Optional  # pylint: disable=unused-import
-
 from certbot import interfaces
-from certbot.display import util as display_util
 from certbot._internal import constants
 from certbot._internal.account import Account  # pylint: disable=unused-import
 from certbot._internal.account import AccountFileStorage
+from certbot.display import util as display_util
 from certbot.interfaces import IConfig  # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)

certbot/certbot/_internal/error_handler.py

@@ -3,12 +3,12 @@ import functools
 import logging
 import signal
 import traceback
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import List
+from typing import Union
 
-from acme.magic_typing import Any
-from acme.magic_typing import Callable
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Union
 from certbot import errors
 from certbot.compat import os
 

certbot/certbot/_internal/hooks.py

@@ -1,9 +1,9 @@
 """Facilities for implementing hooks that call shell commands."""
 
 import logging
+from typing import List
+from typing import Set
 
-from acme.magic_typing import List
-from acme.magic_typing import Set
 from certbot import errors
 from certbot import util
 from certbot.compat import filesystem

certbot/certbot/_internal/lock.py

@@ -1,8 +1,8 @@
 """Implements file locks compatible with Linux and Windows for locking files and directories."""
 import errno
 import logging
+from typing import Optional
 
-from acme.magic_typing import Optional
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os

certbot/certbot/_internal/main.py

@@ -4,13 +4,17 @@
 import functools
 import logging.handlers
 import sys
+from typing import Iterable  # pylint: disable=unused-import
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import Union
 
 import configobj
 import josepy as jose
 import zope.component
 
 from acme import errors as acme_errors
-from acme.magic_typing import Union, Iterable, Optional, List, Tuple  # pylint: disable=unused-import
 import certbot
 from certbot import crypto_util
 from certbot import errors

certbot/certbot/_internal/plugins/disco.py

@@ -2,13 +2,13 @@
 import itertools
 import logging
 import sys
+from typing import Dict
 from collections.abc import Mapping
 
 import pkg_resources
 import zope.interface
 import zope.interface.verify
 
-from acme.magic_typing import Dict
 from certbot import errors
 from certbot import interfaces
 from certbot._internal import constants

certbot/certbot/_internal/plugins/manual.py

@@ -1,9 +1,10 @@
 """Manual authenticator plugin"""
+from typing import Dict
+
 import zope.component
 import zope.interface
 
 from acme import challenges
-from acme.magic_typing import Dict
 from certbot import achallenges  # pylint: disable=unused-import
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/plugins/standalone.py

@@ -4,17 +4,17 @@ import logging
 import socket
 # https://github.com/python/typeshed/blob/master/stdlib/2and3/socket.pyi
 from socket import errno as socket_errors  # type: ignore
+from typing import DefaultDict
+from typing import Dict
+from typing import Set
+from typing import Tuple
+from typing import TYPE_CHECKING
 
 import OpenSSL  # pylint: disable=unused-import
 import zope.interface
 
 from acme import challenges
 from acme import standalone as acme_standalone
-from acme.magic_typing import DefaultDict
-from acme.magic_typing import Dict
-from acme.magic_typing import Set
-from acme.magic_typing import Tuple
-from acme.magic_typing import TYPE_CHECKING
 from certbot import achallenges
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/plugins/webroot.py

@@ -3,15 +3,15 @@ import argparse
 import collections
 import json
 import logging
+from typing import DefaultDict
+from typing import Dict
+from typing import List
+from typing import Set
 
 import zope.component
 import zope.interface
 
 from acme import challenges
-from acme.magic_typing import DefaultDict
-from acme.magic_typing import Dict
-from acme.magic_typing import List
-from acme.magic_typing import Set
 from certbot import achallenges  # pylint: disable=unused-import
 from certbot import errors
 from certbot import interfaces

certbot/certbot/_internal/renewal.py

@@ -7,17 +7,17 @@ import random
 import sys
 import time
 import traceback
+from typing import List
+from typing import Optional  # pylint: disable=unused-import
 
 from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.asymmetric import ec, rsa
+from cryptography.hazmat.primitives.asymmetric import ec
+from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 import OpenSSL
 import zope.component
 
-from acme.magic_typing import List
-from acme.magic_typing import Optional  # pylint: disable=unused-import
 from certbot import crypto_util
-from certbot.display import util as display_util
 from certbot import errors
 from certbot import interfaces
 from certbot import util
@@ -29,6 +29,7 @@ from certbot._internal import storage
 from certbot._internal import updater
 from certbot._internal.plugins import disco as plugins_disco
 from certbot.compat import os
+from certbot.display import util as display_util
 
 logger = logging.getLogger(__name__)
 

certbot/certbot/_internal/snap_config.py

@@ -1,13 +1,13 @@
 """Module configuring Certbot in a snap environment"""
 import logging
 import socket
+from typing import List
 
 from requests import Session
 from requests.adapters import HTTPAdapter
 from requests.exceptions import HTTPError
 from requests.exceptions import RequestException
 
-from acme.magic_typing import List
 from certbot.compat import os
 from certbot.errors import Error
 

certbot/certbot/compat/filesystem.py

@@ -5,8 +5,7 @@ import errno
 import os  # pylint: disable=os-module-forbidden
 import stat
 import sys
-
+from typing import List
-from acme.magic_typing import List
 
 try:
     import ntsecuritycon

certbot/certbot/compat/misc.py

@@ -8,12 +8,12 @@ import logging
 import select
 import subprocess
 import sys
+from typing import Optional
+from typing import Tuple
 
 from certbot import errors
 from certbot.compat import os
 
-from acme.magic_typing import Tuple, Optional
-
 try:
     from win32com.shell import shell as shellwin32
     POSIX_MODE = False

certbot/certbot/crypto_util.py

@@ -6,26 +6,29 @@
 """
 import hashlib
 import logging
+import re
+from typing import IO  # pylint: disable=unused-import
 import warnings
 
-import re
 # See https://github.com/pyca/cryptography/issues/4275
 from cryptography import x509  # type: ignore
-from cryptography.exceptions import InvalidSignature, UnsupportedAlgorithm
+from cryptography.exceptions import InvalidSignature
+from cryptography.exceptions import UnsupportedAlgorithm
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.asymmetric.ec import ECDSA, EllipticCurvePublicKey
+from cryptography.hazmat.primitives.asymmetric.ec import ECDSA
+from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
-from cryptography.hazmat.primitives.serialization import Encoding, NoEncryption, PrivateFormat
+from cryptography.hazmat.primitives.serialization import Encoding
+from cryptography.hazmat.primitives.serialization import NoEncryption
+from cryptography.hazmat.primitives.serialization import PrivateFormat
 from OpenSSL import crypto
 from OpenSSL import SSL  # type: ignore
-
 import pyrfc3339
 import zope.component
 
 from acme import crypto_util as acme_crypto_util
-from acme.magic_typing import IO  # pylint: disable=unused-import
 from certbot import errors
 from certbot import interfaces
 from certbot import util

certbot/certbot/display/util.py

@@ -12,11 +12,11 @@ Other messages can use the `logging` module. See `log.py`.
 import logging
 import sys
 import textwrap
+from typing import List
 
 import zope.interface
 import zope.component
 
-from acme.magic_typing import List
 from certbot import errors
 from certbot import interfaces
 from certbot._internal import constants

certbot/certbot/ocsp.py

@@ -5,6 +5,8 @@ import logging
 import re
 from subprocess import PIPE
 from subprocess import Popen
+from typing import Optional
+from typing import Tuple
 
 from cryptography import x509
 from cryptography.exceptions import InvalidSignature
@@ -16,8 +18,6 @@ from cryptography.hazmat.primitives import serialization
 import pytz
 import requests
 
-from acme.magic_typing import Optional
-from acme.magic_typing import Tuple
 from certbot import crypto_util
 from certbot import errors
 from certbot import util

certbot/certbot/plugins/common.py

@@ -3,12 +3,12 @@ import logging
 import re
 import shutil
 import tempfile
+from typing import List
 
 from josepy import util as jose_util
 import pkg_resources
 import zope.interface
 
-from acme.magic_typing import List
 from certbot import achallenges  # pylint: disable=unused-import
 from certbot import crypto_util
 from certbot import errors

certbot/certbot/plugins/dns_common_lexicon.py

@@ -1,12 +1,12 @@
 """Common code for DNS Authenticator Plugins built on Lexicon."""
 import logging
+from typing import Any
+from typing import Dict
+from typing import Union
 
 from requests.exceptions import HTTPError
 from requests.exceptions import RequestException
 
-from acme.magic_typing import Any
-from acme.magic_typing import Dict
-from acme.magic_typing import Union
 from certbot import errors
 from certbot.plugins import dns_common
 

certbot/certbot/plugins/enhancements.py

@@ -1,9 +1,9 @@
 """New interface style Certbot enhancements"""
 import abc
+from typing import Any
+from typing import Dict
+from typing import List
 
-from acme.magic_typing import Any
-from acme.magic_typing import Dict
-from acme.magic_typing import List
 from certbot._internal import constants
 
 ENHANCEMENTS = ["redirect", "ensure-http-header", "ocsp-stapling"]

certbot/certbot/plugins/storage.py

@@ -1,9 +1,9 @@
 """Plugin storage class."""
 import json
 import logging
+from typing import Any
+from typing import Dict
 
-from acme.magic_typing import Any
-from acme.magic_typing import Dict
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os

certbot/certbot/util.py

@@ -12,13 +12,13 @@ import re
 import socket
 import subprocess
 import sys
+from typing import Dict
+from typing import Text
+from typing import Tuple
+from typing import Union
 
 import configargparse
 
-from acme.magic_typing import Dict
-from acme.magic_typing import Text
-from acme.magic_typing import Tuple
-from acme.magic_typing import Union
 from certbot import errors
 from certbot._internal import constants
 from certbot._internal import lock

tests/letstest/multitester.py

@@ -45,7 +45,6 @@ import yaml
 from fabric import Config
 from fabric import Connection
 
-
 # Command line parser
 #-------------------------------------------------------------------------------
 parser = argparse.ArgumentParser(description='Builds EC2 cluster for testing.')

tools/pipstrap.py

@@ -4,7 +4,6 @@ import os
 
 import pip_install
 
-
 _REQUIREMENTS_PATH = os.path.join(os.path.dirname(__file__), "pipstrap_constraints.txt")
 
 

tools/snap/build_remote.py

@@ -2,12 +2,18 @@
 import argparse
 import datetime
 import glob
+from multiprocessing import Manager
+from multiprocessing import Pool
+from multiprocessing import Process
+from os.path import basename
+from os.path import dirname
+from os.path import exists
+from os.path import join
+from os.path import realpath
 import re
 import subprocess
 import sys
 import time
-from multiprocessing import Pool, Process, Manager
-from os.path import join, realpath, dirname, basename, exists
 
 CERTBOT_DIR = dirname(dirname(dirname(realpath(__file__))))
 PLUGINS = [basename(path) for path in glob.glob(join(CERTBOT_DIR, 'certbot-dns-*'))]