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

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 (
-    assert_hook_execution, assert_saved_renew_hook,
-    assert_cert_count_for_lineage,
-    assert_world_no_permissions, assert_world_read_permissions,
-    assert_equals_group_owner, assert_equals_group_permissions, assert_equals_world_read_permissions,
-    EVERYBODY_SID
-)
+from certbot_integration_tests.certbot_tests.assertions import assert_cert_count_for_lineage
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_group_owner
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_group_permissions
+from certbot_integration_tests.certbot_tests.assertions import assert_equals_world_read_permissions
+from certbot_integration_tests.certbot_tests.assertions import assert_hook_execution
+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 six.moves import socketserver, SimpleHTTPServer
+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
+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 setup, find_packages, __version__ as setuptools_version
-
+from setuptools import __version__ as setuptools_version
+from setuptools import find_packages
+from setuptools import setup
 
 version = '0.32.0.dev0'