rip out six

.pylintrc

@@ -254,7 +254,7 @@ ignore-mixin-members=yes
 # List of module names for which member attributes should not be checked
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis
-ignored-modules=pkg_resources,confargparse,argparse,six.moves,six.moves.urllib
+ignored-modules=pkg_resources,confargparse,argparse
 # import errors ignored only in 1.4.4
 # https://bitbucket.org/logilab/pylint/commits/cd000904c9e2
 

certbot-ci/setup.py

@@ -18,7 +18,6 @@ install_requires = [
     'python-dateutil',
     'pyyaml',
     'requests',
-    'six'
 ]
 
 # Add pywin32 on Windows platforms to handle low-level system calls.

certbot-compatibility-test/setup.py

@@ -10,7 +10,6 @@ version = '1.12.0.dev0'
 install_requires = [
     'certbot',
     'certbot-apache',
-    'six',
     'requests',
     'zope.interface',
 ]

certbot-dns-digitalocean/setup.py

@@ -13,7 +13,6 @@ version = '1.12.0.dev0'
 install_requires = [
     'python-digitalocean>=1.11',
     'setuptools>=39.0.1',
-    'six>=1.11.0',
     'zope.interface',
 ]
 

certbot/setup.py

@@ -31,9 +31,9 @@ meta = dict(re.findall(r"""__([a-z]+)__ = '([^']+)""", read_file(init_fn)))
 readme = read_file(os.path.join(here, 'README.rst'))
 version = meta['version']
 
-# This package relies on PyOpenSSL, requests, and six, however, it isn't
-# specified here to avoid masking the more specific request requirements in
-# acme. See https://github.com/pypa/pip/issues/988 for more info.
+# This package relies on PyOpenSSL and requests, however, it isn't specified
+# here to avoid masking the more specific request requirements in acme. See
+# https://github.com/pypa/pip/issues/988 for more info.
 install_requires = [
     'acme>=1.8.0',
     # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but

certbot/tests/log_test.py

@@ -327,7 +327,7 @@ class PostArgParseExceptHookTest(unittest.TestCase):
 
     def test_acme_error(self):
         # Get an arbitrary error code
-        acme_code = next(six.iterkeys(messages.ERROR_CODES))
+        acme_code = next(messages.ERROR_CODES.keys())
 
         def get_acme_error(msg):
             """Wraps ACME errors so the constructor takes only a msg."""

tools/oldest_constraints.txt

@@ -65,7 +65,6 @@ dns-lexicon==2.2.1
 httplib2==0.9.2
 idna==2.6
 setuptools==39.0.1
-six==1.11.0
 
 # Ubuntu Focal constraints
 asn1crypto==0.24.0