remove six imports

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

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

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

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

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__)

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
 

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

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

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

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

certbot/certbot/_internal/cli/helpful.py

@@ -7,7 +7,6 @@ import glob
 import sys
 
 import configargparse
-import six
 import zope.component
 import zope.interface
 

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
 

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

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

certbot/certbot/_internal/plugins/webroot.py

@@ -4,7 +4,6 @@ import collections
 import json
 import logging
 
-import six
 import zope.component
 import zope.interface
 

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

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

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

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

certbot/certbot/reverter.py

@@ -7,7 +7,6 @@ import sys
 import time
 import traceback
 
-import six
 
 from certbot import errors
 from certbot import util

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

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

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

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

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

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

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

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

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

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):

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

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

certbot/tests/reporter_test.py

@@ -3,7 +3,6 @@ import io
 import sys
 import unittest
 
-import six
 
 try:
     import mock

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

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

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