From 700a1428c2008e4d689ed2e5c620c509715530bf Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 8 Feb 2021 12:27:00 -0800 Subject: [PATCH] remove six imports --- certbot-apache/certbot_apache/_internal/parser.py | 1 - certbot-apache/tests/autohsts_test.py | 1 - certbot-apache/tests/configurator_test.py | 1 - .../certbot_compatibility_test/validator.py | 1 - certbot-nginx/certbot_nginx/_internal/nginxparser.py | 1 - certbot-nginx/certbot_nginx/_internal/obj.py | 1 - certbot-nginx/certbot_nginx/_internal/parser.py | 1 - certbot-nginx/certbot_nginx/_internal/parser_obj.py | 1 - certbot-nginx/tests/http_01_test.py | 1 - certbot/certbot/_internal/account.py | 1 - certbot/certbot/_internal/cli/helpful.py | 1 - certbot/certbot/_internal/plugins/disco.py | 1 - certbot/certbot/_internal/plugins/selection.py | 1 - certbot/certbot/_internal/plugins/standalone.py | 1 - certbot/certbot/_internal/plugins/webroot.py | 1 - certbot/certbot/_internal/renewal.py | 1 - certbot/certbot/_internal/storage.py | 1 - certbot/certbot/crypto_util.py | 1 - certbot/certbot/plugins/dns_test_common.py | 1 - certbot/certbot/reverter.py | 1 - certbot/certbot/tests/acme_util.py | 1 - certbot/certbot/tests/util.py | 1 - certbot/certbot/util.py | 1 - certbot/tests/cli_test.py | 1 - certbot/tests/display/util_test.py | 1 - certbot/tests/log_test.py | 1 - certbot/tests/main_test.py | 1 - certbot/tests/plugins/disco_test.py | 1 - certbot/tests/plugins/manual_test.py | 1 - certbot/tests/plugins/null_test.py | 1 - certbot/tests/plugins/standalone_test.py | 1 - certbot/tests/plugins/webroot_test.py | 1 - certbot/tests/reporter_test.py | 1 - certbot/tests/reverter_test.py | 1 - certbot/tests/storage_test.py | 1 - certbot/tests/util_test.py | 1 - 36 files changed, 36 deletions(-) diff --git a/certbot-apache/certbot_apache/_internal/parser.py b/certbot-apache/certbot_apache/_internal/parser.py index c997d0dc8..75be0833f 100644 --- a/certbot-apache/certbot_apache/_internal/parser.py +++ b/certbot-apache/certbot_apache/_internal/parser.py @@ -5,7 +5,6 @@ import logging import re import sys -import six from acme.magic_typing import Dict from acme.magic_typing import List diff --git a/certbot-apache/tests/autohsts_test.py b/certbot-apache/tests/autohsts_test.py index d15600215..db1c46b52 100644 --- a/certbot-apache/tests/autohsts_test.py +++ b/certbot-apache/tests/autohsts_test.py @@ -7,7 +7,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock # type: ignore -import six # pylint: disable=unused-import # six is used in mock.patch() from certbot import errors from certbot_apache._internal import constants diff --git a/certbot-apache/tests/configurator_test.py b/certbot-apache/tests/configurator_test.py index d5140be54..302bf0023 100644 --- a/certbot-apache/tests/configurator_test.py +++ b/certbot-apache/tests/configurator_test.py @@ -10,7 +10,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock # type: ignore -import six # pylint: disable=unused-import # six is used in mock.patch() from acme import challenges from certbot import achallenges diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py index 5794633c2..9a082523a 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/validator.py +++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py @@ -3,7 +3,6 @@ import logging import socket import requests -import six from acme import crypto_util from acme import errors as acme_errors diff --git a/certbot-nginx/certbot_nginx/_internal/nginxparser.py b/certbot-nginx/certbot_nginx/_internal/nginxparser.py index b94b04d61..f043b0e4d 100644 --- a/certbot-nginx/certbot_nginx/_internal/nginxparser.py +++ b/certbot-nginx/certbot_nginx/_internal/nginxparser.py @@ -15,7 +15,6 @@ from pyparsing import restOfLine from pyparsing import stringEnd from pyparsing import White from pyparsing import ZeroOrMore -import six from acme.magic_typing import IO, Any # pylint: disable=unused-import logger = logging.getLogger(__name__) diff --git a/certbot-nginx/certbot_nginx/_internal/obj.py b/certbot-nginx/certbot_nginx/_internal/obj.py index 0d7d8fcf2..2dd02f180 100644 --- a/certbot-nginx/certbot_nginx/_internal/obj.py +++ b/certbot-nginx/certbot_nginx/_internal/obj.py @@ -1,7 +1,6 @@ """Module contains classes used by the Nginx Configurator.""" import re -import six from certbot.plugins import common diff --git a/certbot-nginx/certbot_nginx/_internal/parser.py b/certbot-nginx/certbot_nginx/_internal/parser.py index 94bfea2c9..fe5d7bb31 100644 --- a/certbot-nginx/certbot_nginx/_internal/parser.py +++ b/certbot-nginx/certbot_nginx/_internal/parser.py @@ -7,7 +7,6 @@ import logging import re import pyparsing -import six from acme.magic_typing import Dict from acme.magic_typing import List diff --git a/certbot-nginx/certbot_nginx/_internal/parser_obj.py b/certbot-nginx/certbot_nginx/_internal/parser_obj.py index b6320172c..d616a1a99 100644 --- a/certbot-nginx/certbot_nginx/_internal/parser_obj.py +++ b/certbot-nginx/certbot_nginx/_internal/parser_obj.py @@ -4,7 +4,6 @@ raw lists of tokens from pyparsing. """ import abc import logging -import six from acme.magic_typing import List from certbot import errors diff --git a/certbot-nginx/tests/http_01_test.py b/certbot-nginx/tests/http_01_test.py index 9d5d46549..2947b099d 100644 --- a/certbot-nginx/tests/http_01_test.py +++ b/certbot-nginx/tests/http_01_test.py @@ -6,7 +6,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock # type: ignore -import six from acme import challenges from certbot import achallenges diff --git a/certbot/certbot/_internal/account.py b/certbot/certbot/_internal/account.py index 3ede0874f..dbe111fbc 100644 --- a/certbot/certbot/_internal/account.py +++ b/certbot/certbot/_internal/account.py @@ -10,7 +10,6 @@ from cryptography.hazmat.primitives import serialization import josepy as jose import pyrfc3339 import pytz -import six from acme import fields as acme_fields from acme import messages diff --git a/certbot/certbot/_internal/cli/helpful.py b/certbot/certbot/_internal/cli/helpful.py index 186a0c574..80afe5db4 100644 --- a/certbot/certbot/_internal/cli/helpful.py +++ b/certbot/certbot/_internal/cli/helpful.py @@ -7,7 +7,6 @@ import glob import sys import configargparse -import six import zope.component import zope.interface diff --git a/certbot/certbot/_internal/plugins/disco.py b/certbot/certbot/_internal/plugins/disco.py index 7cb8d5ff2..dbcecb067 100644 --- a/certbot/certbot/_internal/plugins/disco.py +++ b/certbot/certbot/_internal/plugins/disco.py @@ -5,7 +5,6 @@ import logging import sys import pkg_resources -import six import zope.interface import zope.interface.verify diff --git a/certbot/certbot/_internal/plugins/selection.py b/certbot/certbot/_internal/plugins/selection.py index 5828e7a00..e5c311efe 100644 --- a/certbot/certbot/_internal/plugins/selection.py +++ b/certbot/certbot/_internal/plugins/selection.py @@ -3,7 +3,6 @@ from __future__ import print_function import logging -import six import zope.component from certbot import errors diff --git a/certbot/certbot/_internal/plugins/standalone.py b/certbot/certbot/_internal/plugins/standalone.py index ee02edc30..60c9558cb 100644 --- a/certbot/certbot/_internal/plugins/standalone.py +++ b/certbot/certbot/_internal/plugins/standalone.py @@ -6,7 +6,6 @@ import socket from socket import errno as socket_errors # type: ignore import OpenSSL # pylint: disable=unused-import -import six import zope.interface from acme import challenges diff --git a/certbot/certbot/_internal/plugins/webroot.py b/certbot/certbot/_internal/plugins/webroot.py index f0f16b867..8789db604 100644 --- a/certbot/certbot/_internal/plugins/webroot.py +++ b/certbot/certbot/_internal/plugins/webroot.py @@ -4,7 +4,6 @@ import collections import json import logging -import six import zope.component import zope.interface diff --git a/certbot/certbot/_internal/renewal.py b/certbot/certbot/_internal/renewal.py index 160472527..9fe9cb546 100644 --- a/certbot/certbot/_internal/renewal.py +++ b/certbot/certbot/_internal/renewal.py @@ -13,7 +13,6 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.asymmetric import ec, rsa from cryptography.hazmat.primitives.serialization import load_pem_private_key import OpenSSL -import six import zope.component from acme.magic_typing import List diff --git a/certbot/certbot/_internal/storage.py b/certbot/certbot/_internal/storage.py index 3d223f89f..690567a17 100644 --- a/certbot/certbot/_internal/storage.py +++ b/certbot/certbot/_internal/storage.py @@ -9,7 +9,6 @@ import stat import configobj import parsedatetime import pytz -import six from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey from cryptography.hazmat.primitives.serialization import load_pem_private_key diff --git a/certbot/certbot/crypto_util.py b/certbot/certbot/crypto_util.py index edd4f9eb3..7f712a0f4 100644 --- a/certbot/certbot/crypto_util.py +++ b/certbot/certbot/crypto_util.py @@ -22,7 +22,6 @@ from OpenSSL import crypto from OpenSSL import SSL # type: ignore import pyrfc3339 -import six import zope.component from acme import crypto_util as acme_crypto_util diff --git a/certbot/certbot/plugins/dns_test_common.py b/certbot/certbot/plugins/dns_test_common.py index f26a1603a..a3a26a7a1 100644 --- a/certbot/certbot/plugins/dns_test_common.py +++ b/certbot/certbot/plugins/dns_test_common.py @@ -6,7 +6,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock # type: ignore -import six from acme import challenges from certbot import achallenges diff --git a/certbot/certbot/reverter.py b/certbot/certbot/reverter.py index 0cc943ab5..be9d78a11 100644 --- a/certbot/certbot/reverter.py +++ b/certbot/certbot/reverter.py @@ -7,7 +7,6 @@ import sys import time import traceback -import six from certbot import errors from certbot import util diff --git a/certbot/certbot/tests/acme_util.py b/certbot/certbot/tests/acme_util.py index ce947e880..49ca88bf5 100644 --- a/certbot/certbot/tests/acme_util.py +++ b/certbot/certbot/tests/acme_util.py @@ -2,7 +2,6 @@ import datetime import josepy as jose -import six from acme import challenges from acme import messages diff --git a/certbot/certbot/tests/util.py b/certbot/certbot/tests/util.py index 80f1fcc08..fe2a245da 100644 --- a/certbot/certbot/tests/util.py +++ b/certbot/certbot/tests/util.py @@ -13,7 +13,6 @@ from cryptography.hazmat.primitives import serialization import josepy as jose import OpenSSL import pkg_resources -import six from six.moves import reload_module from certbot import interfaces diff --git a/certbot/certbot/util.py b/certbot/certbot/util.py index d8b001546..7bbc02f5f 100644 --- a/certbot/certbot/util.py +++ b/certbot/certbot/util.py @@ -15,7 +15,6 @@ import subprocess import sys import configargparse -import six from acme.magic_typing import Text from acme.magic_typing import Tuple diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py index 90dadb0a9..2fec685c5 100644 --- a/certbot/tests/cli_test.py +++ b/certbot/tests/cli_test.py @@ -5,7 +5,6 @@ import io import tempfile import unittest -import six from six.moves import reload_module # pylint: disable=import-error from acme import challenges diff --git a/certbot/tests/display/util_test.py b/certbot/tests/display/util_test.py index ebefb2f3d..e136c454f 100644 --- a/certbot/tests/display/util_test.py +++ b/certbot/tests/display/util_test.py @@ -5,7 +5,6 @@ import socket import tempfile import unittest -import six from certbot import errors from certbot import interfaces diff --git a/certbot/tests/log_test.py b/certbot/tests/log_test.py index 92c47cbf6..2f6caade7 100644 --- a/certbot/tests/log_test.py +++ b/certbot/tests/log_test.py @@ -6,7 +6,6 @@ import sys import time import unittest -import six from acme import messages from certbot import errors diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index bb6790952..a7b8dce70 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -15,7 +15,6 @@ import unittest import josepy as jose import pytz -import six from six.moves import reload_module # pylint: disable=import-error from certbot import crypto_util diff --git a/certbot/tests/plugins/disco_test.py b/certbot/tests/plugins/disco_test.py index efdb85a4e..a97de24b9 100644 --- a/certbot/tests/plugins/disco_test.py +++ b/certbot/tests/plugins/disco_test.py @@ -8,7 +8,6 @@ try: except ImportError: # pragma: no cover from unittest import mock import pkg_resources -import six import zope.interface from certbot import errors diff --git a/certbot/tests/plugins/manual_test.py b/certbot/tests/plugins/manual_test.py index d7c02e0d5..f3c580517 100644 --- a/certbot/tests/plugins/manual_test.py +++ b/certbot/tests/plugins/manual_test.py @@ -6,7 +6,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock -import six from acme import challenges from certbot import errors diff --git a/certbot/tests/plugins/null_test.py b/certbot/tests/plugins/null_test.py index 035d41c93..dad5b270a 100644 --- a/certbot/tests/plugins/null_test.py +++ b/certbot/tests/plugins/null_test.py @@ -5,7 +5,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock -import six class InstallerTest(unittest.TestCase): diff --git a/certbot/tests/plugins/standalone_test.py b/certbot/tests/plugins/standalone_test.py index f9c0edb73..596cee622 100644 --- a/certbot/tests/plugins/standalone_test.py +++ b/certbot/tests/plugins/standalone_test.py @@ -10,7 +10,6 @@ try: except ImportError: # pragma: no cover from unittest import mock import OpenSSL.crypto # pylint: disable=unused-import -import six from acme import challenges from acme import standalone as acme_standalone # pylint: disable=unused-import diff --git a/certbot/tests/plugins/webroot_test.py b/certbot/tests/plugins/webroot_test.py index 197e428cc..e6fbd8e88 100644 --- a/certbot/tests/plugins/webroot_test.py +++ b/certbot/tests/plugins/webroot_test.py @@ -14,7 +14,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock -import six from acme import challenges from certbot import achallenges diff --git a/certbot/tests/reporter_test.py b/certbot/tests/reporter_test.py index 522e3227c..7a37f782e 100644 --- a/certbot/tests/reporter_test.py +++ b/certbot/tests/reporter_test.py @@ -3,7 +3,6 @@ import io import sys import unittest -import six try: import mock diff --git a/certbot/tests/reverter_test.py b/certbot/tests/reverter_test.py index 1e3d51a37..af01a9a1b 100644 --- a/certbot/tests/reverter_test.py +++ b/certbot/tests/reverter_test.py @@ -9,7 +9,6 @@ try: import mock except ImportError: # pragma: no cover from unittest import mock -import six from certbot import errors from certbot.compat import os diff --git a/certbot/tests/storage_test.py b/certbot/tests/storage_test.py index 83929553f..abd496c8d 100644 --- a/certbot/tests/storage_test.py +++ b/certbot/tests/storage_test.py @@ -11,7 +11,6 @@ try: except ImportError: # pragma: no cover from unittest import mock import pytz -import six import certbot from certbot import errors diff --git a/certbot/tests/util_test.py b/certbot/tests/util_test.py index ffed05e90..2e008c9b5 100644 --- a/certbot/tests/util_test.py +++ b/certbot/tests/util_test.py @@ -5,7 +5,6 @@ import io import sys import unittest -import six from six.moves import reload_module # pylint: disable=import-error from certbot import errors