Reorganize imports (#7616)

* Isort execution

* Fix pylint, adapt coverage

* New isort

* Fix magic_typing lint

* Second round

* Fix pylint

* Third round. Store isort configuration

* Fix latest mistakes

* Other fixes

* Add newline

* Fix lint errors

.isort.cfg

@@ -0,0 +1,7 @@
+[settings]
+skip_glob=venv*
+skip=letsencrypt-auto-source
+force_sort_within_sections=True
+force_single_line=True
+order_by_type=False
+line_length=400

acme/acme/__init__.py

@@ -13,7 +13,6 @@ import warnings
 #
 # It is based on
 # https://github.com/requests/requests/blob/1278ecdf71a312dc2268f3bfc0aabfab3c006dcf/requests/packages.py
-
 import josepy as jose
 
 for mod in list(sys.modules):

acme/acme/client.py

@@ -5,25 +5,26 @@ import datetime
 from email.utils import parsedate_tz
 import heapq
 import logging
-import time
 import re
 import sys
+import time
 
-import six
-from six.moves import http_client  # pylint: disable=import-error
 import josepy as jose
 import OpenSSL
 import requests
 from requests.adapters import HTTPAdapter
 from requests_toolbelt.adapters.source import SourceAddressAdapter
+import six
+from six.moves import http_client  # pylint: disable=import-error
 
 from acme import crypto_util
 from acme import errors
 from acme import jws
 from acme import messages
-# pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Dict  # pylint: disable=unused-import, no-name-in-module
-from acme.magic_typing import Dict, List, Set, Text
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Text  # pylint: disable=unused-import, no-name-in-module
 
 logger = logging.getLogger(__name__)
 

acme/acme/crypto_util.py

@@ -6,15 +6,15 @@ import os
 import re
 import socket
 
-from OpenSSL import crypto
-from OpenSSL import SSL # type: ignore # https://github.com/python/typeshed/issues/2052
 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
-# pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Callable  # pylint: disable=unused-import, no-name-in-module
-from acme.magic_typing import Callable, Union, Tuple, Optional
+from acme.magic_typing import Optional  # pylint: disable=unused-import, no-name-in-module
-# pylint: enable=unused-import, no-name-in-module
+from acme.magic_typing import Tuple  # pylint: disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Union  # pylint: disable=unused-import, no-name-in-module
 
 logger = logging.getLogger(__name__)
 

acme/acme/fields.py

@@ -4,7 +4,6 @@ import logging
 import josepy as jose
 import pyrfc3339
 
-
 logger = logging.getLogger(__name__)
 
 

acme/acme/magic_typing.py

@@ -1,6 +1,7 @@
 """Shim class to not have to depend on typing module in prod."""
 import sys
 
+
 class TypingClass(object):
     """Ignore import errors by getting anything"""
     def __getattr__(self, name):

acme/acme/messages.py

@@ -1,18 +1,21 @@
 """ACME protocol messages."""
 import json
+
+import josepy as jose
 import six
+
+from acme import challenges
+from acme import errors
+from acme import fields
+from acme import jws
+from acme import util
+
 try:
     from collections.abc import Hashable  # pylint: disable=no-name-in-module
 except ImportError:  # pragma: no cover
     from collections import Hashable
 
-import josepy as jose
 
-from acme import challenges
-from acme import errors
-from acme import fields
-from acme import util
-from acme import jws
 
 OLD_ERROR_PREFIX = "urn:acme:error:"
 ERROR_PREFIX = "urn:ietf:params:acme:error:"

acme/acme/standalone.py

@@ -11,8 +11,7 @@ from six.moves import socketserver  # type: ignore  # pylint: disable=import-err
 
 from acme import challenges
 from acme import crypto_util
-from acme.magic_typing import List # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
 
 logger = logging.getLogger(__name__)
 

acme/docs/conf.py

@@ -12,10 +12,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import shlex
-
+import sys
 
 here = os.path.abspath(os.path.dirname(__file__))
 

acme/examples/http01_example.py

@@ -26,8 +26,10 @@ Workflow:
     - Deactivate Account
 """
 from contextlib import contextmanager
+
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
+import josepy as jose
 import OpenSSL
 
 from acme import challenges
@@ -36,7 +38,6 @@ from acme import crypto_util
 from acme import errors
 from acme import messages
 from acme import standalone
-import josepy as jose
 
 # Constants:
 

acme/setup.py

@@ -1,8 +1,9 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
+
 version = '1.1.0.dev0'
 
 # Please update tox.ini when modifying dependency version requirements

acme/tests/challenges_test.py

@@ -4,7 +4,6 @@ import unittest
 import josepy as jose
 import mock
 import requests
-
 from six.moves.urllib import parse as urllib_parse  # pylint: disable=relative-import
 
 import test_util

acme/tests/client_test.py

@@ -5,19 +5,17 @@ import datetime
 import json
 import unittest
 
-from six.moves import http_client  # pylint: disable=import-error
-
 import josepy as jose
 import mock
 import OpenSSL
 import requests
+from six.moves import http_client  # pylint: disable=import-error
 
 from acme import challenges
 from acme import errors
 from acme import jws as acme_jws
 from acme import messages
-from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Dict  # pylint: disable=unused-import, no-name-in-module
-
 import messages_test
 import test_util
 

acme/tests/crypto_util_test.py

@@ -5,17 +5,16 @@ import threading
 import time
 import unittest
 
-import six
-from six.moves import socketserver  #type: ignore  # pylint: disable=import-error
-
 import josepy as jose
 import OpenSSL
+import six
+from six.moves import socketserver  # type: ignore  # pylint: disable=import-error
 
 from acme import errors
-from acme.magic_typing import List # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
 import test_util
 
+
 class SSLSocketAndProbeSNITest(unittest.TestCase):
     """Tests for acme.crypto_util.SSLSocket/probe_sni."""
 

acme/tests/jose_test.py

@@ -2,6 +2,7 @@
 import importlib
 import unittest
 
+
 class JoseTest(unittest.TestCase):
     """Tests for acme.jose shim."""
 

acme/tests/jws_test.py

@@ -5,7 +5,6 @@ import josepy as jose
 
 import test_util
 
-
 KEY = jose.JWKRSA.load(test_util.load_vector('rsa512_key.pem'))
 
 

acme/tests/messages_test.py

@@ -5,8 +5,7 @@ import josepy as jose
 import mock
 
 from acme import challenges
-from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Dict  # pylint: disable=unused-import, no-name-in-module
-
 import test_util
 
 CERT = test_util.load_comparable_cert('cert.der')

acme/tests/standalone_test.py

@@ -3,18 +3,17 @@ import socket
 import threading
 import unittest
 
-from six.moves import http_client  # pylint: disable=import-error
-from six.moves import socketserver  # type: ignore  # pylint: disable=import-error
-
 import josepy as jose
 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
 
 from acme import challenges
-from acme.magic_typing import Set # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
-
 import test_util
 
+
 class TLSServerTest(unittest.TestCase):
     """Tests for acme.standalone.TLSServer."""
 

acme/tests/test_util.py

@@ -4,12 +4,12 @@
 
 """
 import os
-import pkg_resources
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
 import josepy as jose
 from OpenSSL import crypto
+import pkg_resources
 
 
 def load_vector(*names):

certbot-apache/certbot_apache/_internal/configurator.py

@@ -1,5 +1,6 @@
 """Apache Configurator."""
 # pylint: disable=too-many-lines
+from collections import defaultdict
 import copy
 import fnmatch
 import logging
@@ -7,28 +8,26 @@ import re
 import socket
 import time
 
-from collections import defaultdict
-
 import pkg_resources
 import six
-
 import zope.component
 import zope.interface
 
 from acme import challenges
-from acme.magic_typing import DefaultDict, Dict, List, Set, Union  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import DefaultDict  # pylint: disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Dict  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Union  # pylint: disable=unused-import, no-name-in-module
 from certbot import errors
 from certbot import interfaces
 from certbot import util
-
 from certbot.achallenges import KeyAuthorizationAnnotatedChallenge  # pylint: disable=unused-import
 from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.plugins import common
-from certbot.plugins.util import path_surgery
 from certbot.plugins.enhancements import AutoHSTSEnhancement
-
+from certbot.plugins.util import path_surgery
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import constants
 from certbot_apache._internal import display_ops

certbot-apache/certbot_apache/_internal/constants.py

@@ -3,7 +3,6 @@ import pkg_resources
 
 from certbot.compat import os
 
-
 MOD_SSL_CONF_DEST = "options-ssl-apache.conf"
 """Name of the mod_ssl config file as saved in `IConfig.config_dir`."""
 

certbot-apache/certbot_apache/_internal/display_ops.py

@@ -3,10 +3,10 @@ import logging
 
 import zope.component
 
-import certbot.display.util as display_util
 from certbot import errors
 from certbot import interfaces
 from certbot.compat import os
+import certbot.display.util as display_util
 
 logger = logging.getLogger(__name__)
 

certbot-apache/certbot_apache/_internal/entrypoint.py

@@ -4,13 +4,12 @@
 from distutils.version import LooseVersion  # pylint: disable=no-name-in-module,import-error
 
 from certbot import util
-
 from certbot_apache._internal import configurator
 from certbot_apache._internal import override_arch
-from certbot_apache._internal import override_fedora
+from certbot_apache._internal import override_centos
 from certbot_apache._internal import override_darwin
 from certbot_apache._internal import override_debian
-from certbot_apache._internal import override_centos
+from certbot_apache._internal import override_fedora
 from certbot_apache._internal import override_gentoo
 from certbot_apache._internal import override_suse
 

certbot-apache/certbot_apache/_internal/http_01.py

@@ -1,13 +1,12 @@
 """A class that performs HTTP-01 challenges for Apache"""
 import logging
 
-from acme.magic_typing import List, Set  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
 from certbot import errors
-from certbot.compat import os
 from certbot.compat import filesystem
+from certbot.compat import os
 from certbot.plugins import common
-
 from certbot_apache._internal.obj import VirtualHost  # pylint: disable=unused-import
 from certbot_apache._internal.parser import get_aug_path
 

certbot-apache/certbot_apache/_internal/obj.py

@@ -1,7 +1,7 @@
 """Module contains classes used by the Apache Configurator."""
 import re
 
-from acme.magic_typing import Set # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
 from certbot.plugins import common
 
 

certbot-apache/certbot_apache/_internal/override_arch.py

@@ -1,13 +1,12 @@
 """ Distribution specific override class for Arch Linux """
 import pkg_resources
-
 import zope.interface
 
 from certbot import interfaces
 from certbot.compat import os
-
 from certbot_apache._internal import configurator
 
+
 @zope.interface.provider(interfaces.IPluginFactory)
 class ArchConfigurator(configurator.ApacheConfigurator):
     """Arch Linux specific ApacheConfigurator override class"""

certbot-apache/certbot_apache/_internal/override_centos.py

@@ -4,19 +4,16 @@ import logging
 import pkg_resources
 import zope.interface
 
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
 from certbot import errors
 from certbot import interfaces
 from certbot import util
 from certbot.compat import os
 from certbot.errors import MisconfigurationError
-
-from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import parser
 
-
 logger = logging.getLogger(__name__)
 
 

certbot-apache/certbot_apache/_internal/override_darwin.py

@@ -1,13 +1,12 @@
 """ Distribution specific override class for macOS """
 import pkg_resources
-
 import zope.interface
 
 from certbot import interfaces
 from certbot.compat import os
-
 from certbot_apache._internal import configurator
 
+
 @zope.interface.provider(interfaces.IPluginFactory)
 class DarwinConfigurator(configurator.ApacheConfigurator):
     """macOS specific ApacheConfigurator override class"""

certbot-apache/certbot_apache/_internal/override_debian.py

@@ -9,7 +9,6 @@ from certbot import interfaces
 from certbot import util
 from certbot.compat import filesystem
 from certbot.compat import os
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 

certbot-apache/certbot_apache/_internal/override_fedora.py

@@ -6,7 +6,6 @@ from certbot import errors
 from certbot import interfaces
 from certbot import util
 from certbot.compat import os
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import parser

certbot-apache/certbot_apache/_internal/override_gentoo.py

@@ -1,15 +1,14 @@
 """ Distribution specific override class for Gentoo Linux """
 import pkg_resources
-
 import zope.interface
 
 from certbot import interfaces
 from certbot.compat import os
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import configurator
 from certbot_apache._internal import parser
 
+
 @zope.interface.provider(interfaces.IPluginFactory)
 class GentooConfigurator(configurator.ApacheConfigurator):
     """Gentoo specific ApacheConfigurator override class"""

certbot-apache/certbot_apache/_internal/override_suse.py

@@ -1,13 +1,12 @@
 """ Distribution specific override class for OpenSUSE """
 import pkg_resources
-
 import zope.interface
 
 from certbot import interfaces
 from certbot.compat import os
-
 from certbot_apache._internal import configurator
 
+
 @zope.interface.provider(interfaces.IPluginFactory)
 class OpenSUSEConfigurator(configurator.ApacheConfigurator):
     """OpenSUSE specific ApacheConfigurator override class"""

certbot-apache/certbot_apache/_internal/parser.py

@@ -8,11 +8,11 @@ import sys
 
 import six
 
-from acme.magic_typing import Dict, List, Set  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Dict  # pylint: disable=unused-import, no-name-in-module
-
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
 from certbot import errors
 from certbot.compat import os
-
 from certbot_apache._internal import constants
 
 logger = logging.getLogger(__name__)

certbot-apache/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-apache/tests/autohsts_test.py

@@ -2,13 +2,12 @@
 """Test for certbot_apache._internal.configurator AutoHSTS functionality"""
 import re
 import unittest
+
 import mock
-# six is used in mock.patch()
+import six  # pylint: disable=unused-import  # six is used in mock.patch()
-import six  # pylint: disable=unused-import
 
 from certbot import errors
 from certbot_apache._internal import constants
-
 import util
 
 

certbot-apache/tests/centos6_test.py

@@ -3,11 +3,9 @@ import unittest
 
 from certbot.compat import os
 from certbot.errors import MisconfigurationError
-
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
 from certbot_apache._internal import parser
-
 import util
 
 

certbot-apache/tests/centos_test.py

@@ -6,10 +6,8 @@ import mock
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
-
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
-
 import util
 
 

certbot-apache/tests/complex_parsing_test.py

@@ -4,7 +4,6 @@ import unittest
 
 from certbot import errors
 from certbot.compat import os
-
 import util
 
 

certbot-apache/tests/configurator_reverter_test.py

@@ -5,7 +5,6 @@ import unittest
 import mock
 
 from certbot import errors
-
 import util
 
 

certbot-apache/tests/configurator_test.py

@@ -7,24 +7,20 @@ import tempfile
 import unittest
 
 import mock
-# six is used in mock.patch()
+import six  # pylint: disable=unused-import  # six is used in mock.patch()
-import six  # pylint: disable=unused-import
 
 from acme import challenges
-
 from certbot import achallenges
 from certbot import crypto_util
 from certbot import errors
-from certbot.compat import os
 from certbot.compat import filesystem
+from certbot.compat import os
 from certbot.tests import acme_util
 from certbot.tests import util as certbot_util
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import constants
 from certbot_apache._internal import obj
 from certbot_apache._internal import parser
-
 import util
 
 

certbot-apache/tests/debian_test.py

@@ -6,10 +6,8 @@ import mock
 
 from certbot import errors
 from certbot.compat import os
-
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import obj
-
 import util
 
 

certbot-apache/tests/display_ops_test.py

@@ -4,15 +4,10 @@ import unittest
 import mock
 
 from certbot import errors
-
 from certbot.display import util as display_util
-
 from certbot.tests import util as certbot_util
-
 from certbot_apache._internal import obj
-
 from certbot_apache._internal.display_ops import select_vhost_multiple
-
 import util
 
 

certbot-apache/tests/fedora_test.py

@@ -6,10 +6,8 @@ import mock
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
-
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_fedora
-
 import util
 
 

certbot-apache/tests/gentoo_test.py

@@ -6,10 +6,8 @@ import mock
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
-
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_gentoo
-
 import util
 
 

certbot-apache/tests/http_01_test.py

@@ -1,21 +1,18 @@
 """Test for certbot_apache._internal.http_01."""
 import unittest
+
 import mock
 
 from acme import challenges
 from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
-
 from certbot import achallenges
 from certbot import errors
 from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.tests import acme_util
-
 from certbot_apache._internal.parser import get_aug_path
-
 import util
 
-
 NUM_ACHALLS = 3
 
 

certbot-apache/tests/parser_test.py

@@ -6,7 +6,6 @@ import mock
 
 from certbot import errors
 from certbot.compat import os
-
 import util
 
 

certbot-apache/tests/util.py

@@ -12,7 +12,6 @@ from certbot.compat import os
 from certbot.display import util as display_util
 from certbot.plugins import common
 from certbot.tests import util as test_util
-
 from certbot_apache._internal import configurator
 from certbot_apache._internal import entrypoint
 from certbot_apache._internal import obj

certbot-ci/certbot_integration_tests/assets/hook.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import sys
 import os
+import sys
 
 hook_script_type = os.path.basename(os.path.dirname(sys.argv[1]))
 if hook_script_type == 'deploy' and ('RENEWED_DOMAINS' not in os.environ or 'RENEWED_LINEAGE' not in os.environ):

certbot-ci/certbot_integration_tests/certbot_tests/assertions.py

@@ -1,5 +1,6 @@
 """This module contains advanced assertions for the certbot integration tests."""
 import os
+
 try:
     import grp
     POSIX_MODE = True

certbot-ci/certbot_integration_tests/certbot_tests/test_main.py

@@ -2,21 +2,25 @@
 from __future__ import print_function
 
 import os
+from os.path import exists
+from os.path import join
 import re
 import shutil
 import subprocess
 import time
-from os.path import join, exists
 
 import pytest
+
 from certbot_integration_tests.certbot_tests import context as certbot_context
-from certbot_integration_tests.certbot_tests.assertions import (
+from certbot_integration_tests.certbot_tests.assertions import assert_cert_count_for_lineage
-    assert_hook_execution, assert_saved_renew_hook,
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_group_owner
-    assert_cert_count_for_lineage,
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_group_permissions
-    assert_world_no_permissions, assert_world_read_permissions,
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_world_read_permissions
-    assert_equals_group_owner, assert_equals_group_permissions, assert_equals_world_read_permissions,
+from certbot_integration_tests.certbot_tests.assertions import assert_hook_execution
-    EVERYBODY_SID
+from certbot_integration_tests.certbot_tests.assertions import assert_saved_renew_hook
-)
+from certbot_integration_tests.certbot_tests.assertions import assert_world_no_permissions
+from certbot_integration_tests.certbot_tests.assertions import assert_world_read_permissions
+from certbot_integration_tests.certbot_tests.assertions import EVERYBODY_SID
 from certbot_integration_tests.utils import misc
 
 

certbot-ci/certbot_integration_tests/conftest.py

@@ -7,8 +7,8 @@ for a directory a specific configuration using built-in pytest hooks.
 See https://docs.pytest.org/en/latest/reference.html#hook-reference
 """
 import contextlib
-import sys
 import subprocess
+import sys
 
 from certbot_integration_tests.utils import acme_server as acme_lib
 

certbot-ci/certbot_integration_tests/nginx_tests/context.py

@@ -2,8 +2,9 @@ import os
 import subprocess
 
 from certbot_integration_tests.certbot_tests import context as certbot_context
-from certbot_integration_tests.utils import misc, certbot_call
 from certbot_integration_tests.nginx_tests import nginx_config as config
+from certbot_integration_tests.utils import certbot_call
+from certbot_integration_tests.utils import misc
 
 
 class IntegrationTestsContext(certbot_context.IntegrationTestsContext):

certbot-ci/certbot_integration_tests/utils/acme_server.py

@@ -1,19 +1,22 @@
 #!/usr/bin/env python
 """Module to setup an ACME CA server environment able to run multiple tests in parallel"""
 from __future__ import print_function
+
 import errno
 import json
+import os
+from os.path import join
+import shutil
+import subprocess
+import sys
 import tempfile
 import time
-import os
-import subprocess
-import shutil
-import sys
-from os.path import join
 
 import requests
 
-from certbot_integration_tests.utils import misc, proxy, pebble_artifacts
+from certbot_integration_tests.utils import misc
+from certbot_integration_tests.utils import pebble_artifacts
+from certbot_integration_tests.utils import proxy
 from certbot_integration_tests.utils.constants import *
 
 

certbot-ci/certbot_integration_tests/utils/certbot_call.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 """Module to call certbot in test mode"""
 from __future__ import absolute_import
+
 from distutils.version import LooseVersion
+import os
 import subprocess
 import sys
-import os
 
 import certbot_integration_tests
 from certbot_integration_tests.utils.constants import *

certbot-ci/certbot_integration_tests/utils/misc.py

@@ -3,27 +3,27 @@ Misc module contains stateless functions that could be used during pytest execut
 or outside during setup/teardown of the integration tests environment.
 """
 import contextlib
-import logging
 import errno
 import multiprocessing
 import os
 import re
 import shutil
 import stat
-import subprocess
 import sys
 import tempfile
 import time
 import warnings
-from distutils.version import LooseVersion
 
-import pkg_resources
-import requests
-from OpenSSL import crypto
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.serialization import Encoding, PrivateFormat, NoEncryption
+from cryptography.hazmat.primitives.serialization import Encoding
-from six.moves import socketserver, SimpleHTTPServer
+from cryptography.hazmat.primitives.serialization import NoEncryption
+from cryptography.hazmat.primitives.serialization import PrivateFormat
+from OpenSSL import crypto
+import pkg_resources
+import requests
+from six.moves import SimpleHTTPServer
+from six.moves import socketserver
 
 RSA_KEY_TYPE = 'rsa'
 ECDSA_KEY_TYPE = 'ecdsa'

certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py

@@ -6,17 +6,18 @@ to serve a mock OCSP responder during integration tests against Pebble.
 import datetime
 import re
 
-import requests
-from dateutil import parser
-
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import serialization, hashes
 from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives import serialization
 from cryptography.x509 import ocsp
+from dateutil import parser
+import requests
 from six.moves import BaseHTTPServer
 
+from certbot_integration_tests.utils.constants import MOCK_OCSP_SERVER_PORT
+from certbot_integration_tests.utils.constants import PEBBLE_MANAGEMENT_URL
 from certbot_integration_tests.utils.misc import GracefulTCPServer
-from certbot_integration_tests.utils.constants import MOCK_OCSP_SERVER_PORT, PEBBLE_MANAGEMENT_URL
 
 
 class _ProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler):

certbot-ci/certbot_integration_tests/utils/proxy.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import json
-import sys
 import re
+import sys
 
 import requests
 from six.moves import BaseHTTPServer

certbot-ci/setup.py

@@ -1,8 +1,9 @@
+from distutils.version import StrictVersion
 import sys
 
-from distutils.version import StrictVersion
+from setuptools import __version__ as setuptools_version
-from setuptools import setup, find_packages, __version__ as setuptools_version
+from setuptools import find_packages
-
+from setuptools import setup
 
 version = '0.32.0.dev0'
 

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

@@ -6,9 +6,9 @@ import subprocess
 import mock
 import zope.interface
 
-from certbot._internal import configuration
 from certbot import errors as le_errors
 from certbot import util as certbot_util
+from certbot._internal import configuration
 from certbot_apache._internal import entrypoint
 from certbot_compatibility_test import errors
 from certbot_compatibility_test import interfaces

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

@@ -8,7 +8,6 @@ from certbot._internal import constants
 from certbot_compatibility_test import errors
 from certbot_compatibility_test import util
 
-
 logger = logging.getLogger(__name__)
 
 

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

@@ -6,14 +6,13 @@ import subprocess
 import zope.interface
 
 from acme.magic_typing import Set  # pylint: disable=unused-import, no-name-in-module
-
 from certbot._internal import configuration
-from certbot_nginx._internal import configurator
-from certbot_nginx._internal import constants
 from certbot_compatibility_test import errors
 from certbot_compatibility_test import interfaces
 from certbot_compatibility_test import util
 from certbot_compatibility_test.configurators import common as configurators_common
+from certbot_nginx._internal import configurator
+from certbot_nginx._internal import constants
 
 
 @zope.interface.implementer(interfaces.IConfiguratorProxy)

certbot-compatibility-test/certbot_compatibility_test/test_driver.py

@@ -5,31 +5,28 @@ import filecmp
 import logging
 import os
 import shutil
+import sys
 import tempfile
 import time
-import sys
-from urllib3.util import connection
 
 import OpenSSL
-
 from six.moves import xrange  # pylint: disable=import-error,redefined-builtin
+from urllib3.util import connection
 
 from acme import challenges
 from acme import crypto_util
 from acme import messages
-from acme.magic_typing import List, Tuple  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import List  # pylint: disable=unused-import, no-name-in-module
+from acme.magic_typing import Tuple  # pylint: disable=unused-import, no-name-in-module
 from certbot import achallenges
 from certbot import errors as le_errors
 from certbot.tests import acme_util
-
 from certbot_compatibility_test import errors
 from certbot_compatibility_test import util
 from certbot_compatibility_test import validator
-
 from certbot_compatibility_test.configurators.apache import common as a_common
 from certbot_compatibility_test.configurators.nginx import common as n_common
 
-
 DESCRIPTION = """
 Tests Certbot plugins against different server configurations. It is
 assumed that Docker is already installed. If no test type is specified, all

certbot-compatibility-test/certbot_compatibility_test/util.py

@@ -8,12 +8,10 @@ import tarfile
 
 import josepy as jose
 
-from certbot.tests import util as test_util
 from certbot._internal import constants
-
+from certbot.tests import util as test_util
 from certbot_compatibility_test import errors
 
-
 _KEY_BASE = "rsa2048_key.pem"
 KEY_PATH = test_util.vector_path(_KEY_BASE)
 KEY = test_util.load_pyopenssl_private_key(_KEY_BASE)

certbot-compatibility-test/certbot_compatibility_test/validator.py

@@ -1,15 +1,14 @@
 """Validators to determine the current webserver configuration"""
 import logging
 import socket
-import requests
 
+import requests
 import six
-from six.moves import xrange  # pylint: disable=import-error,redefined-builtin
+from six.moves import xrange  # pylint: disable=import-error, redefined-builtin
 
 from acme import crypto_util
 from acme import errors as acme_errors
 
-
 logger = logging.getLogger(__name__)
 
 

certbot-compatibility-test/certbot_compatibility_test/validator_test.py

@@ -1,9 +1,9 @@
 """Tests for certbot_compatibility_test.validator."""
 import unittest
-import requests
 
 import mock
 import OpenSSL
+import requests
 
 from acme import errors as acme_errors
 from certbot_compatibility_test import validator

certbot-compatibility-test/nginx/roundtrip.py

@@ -5,6 +5,7 @@ import sys
 
 from certbot_nginx._internal import nginxparser
 
+
 def roundtrip(stuff):
     success = True
     for t in stuff:

certbot-compatibility-test/setup.py

@@ -1,8 +1,7 @@
 import sys
 
-from setuptools import setup
 from setuptools import find_packages
-
+from setuptools import setup
 
 version = '1.1.0.dev0'
 

certbot-dns-cloudflare/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-cloudflare/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-cloudxns/certbot_dns_cloudxns/_internal/dns_cloudxns.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for CloudXNS DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import cloudxns
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-cloudxns/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-cloudxns/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-cloudxns/tests/dns_cloudxns_test.py

@@ -3,7 +3,8 @@
 import unittest
 
 import mock
-from requests.exceptions import HTTPError, RequestException
+from requests.exceptions import HTTPError
+from requests.exceptions import RequestException
 
 from certbot.compat import os
 from certbot.plugins import dns_test_common

certbot-dns-digitalocean/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-digitalocean/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for DNSimple DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import dnsimple
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-dnsimple/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-dnsimple/setup.py

@@ -1,9 +1,9 @@
 import os
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for DNS Made Easy DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import dnsmadeeasy
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-dnsmadeeasy/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-dnsmadeeasy/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-gehirn/certbot_dns_gehirn/_internal/dns_gehirn.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for Gehirn Infrastracture Service DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import gehirn
+import zope.interface
 
 from certbot import interfaces
 from certbot.plugins import dns_common

certbot-dns-gehirn/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-gehirn/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-google/certbot_dns_google/_internal/dns_google.py

@@ -2,11 +2,11 @@
 import json
 import logging
 
-import httplib2
-import zope.interface
 from googleapiclient import discovery
 from googleapiclient import errors as googleapiclient_errors
+import httplib2
 from oauth2client.service_account import ServiceAccountCredentials
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-google/docs/conf.py

@@ -18,6 +18,7 @@
 #
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('_ext'))
 
 

certbot-dns-google/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-google/tests/dns_google_test.py

@@ -2,11 +2,11 @@
 
 import unittest
 
-import mock
 from googleapiclient import discovery
 from googleapiclient.errors import Error
 from googleapiclient.http import HttpMock
 from httplib2 import ServerNotFoundError
+import mock
 
 from certbot import errors
 from certbot.compat import os

certbot-dns-linode/certbot_dns_linode/_internal/dns_linode.py

@@ -2,9 +2,9 @@
 import logging
 import re
 
-import zope.interface
 from lexicon.providers import linode
 from lexicon.providers import linode4
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-linode/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-linode/setup.py

@@ -1,8 +1,9 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
+
 version = '1.1.0.dev0'
 
 # Please update tox.ini when modifying dependency version requirements

certbot-dns-luadns/certbot_dns_luadns/_internal/dns_luadns.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for LuaDNS DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import luadns
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-luadns/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-luadns/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-nsone/certbot_dns_nsone/_internal/dns_nsone.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for NS1 DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import nsone
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-nsone/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-nsone/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'
 

certbot-dns-ovh/certbot_dns_ovh/_internal/dns_ovh.py

@@ -1,8 +1,8 @@
 """DNS Authenticator for OVH DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import ovh
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces

certbot-dns-ovh/docs/conf.py

@@ -17,6 +17,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 

certbot-dns-ovh/setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 version = '1.1.0.dev0'