From ce79bc4e98670675a90089d30462672f4766d2b2 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 8 Feb 2021 12:37:51 -0800
Subject: [PATCH] rip out six

---
 .pylintrc                           | 2 +-
 certbot-ci/setup.py                 | 1 -
 certbot-compatibility-test/setup.py | 1 -
 certbot-dns-digitalocean/setup.py   | 1 -
 certbot/setup.py                    | 6 +++---
 certbot/tests/log_test.py           | 2 +-
 tools/oldest_constraints.txt        | 1 -
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 0e78828bd..a2468b0cf 100644
--- a/.pylintrc
+++ b/.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
 
diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py
index 3277df1c0..9f9c1f462 100644
--- a/certbot-ci/setup.py
+++ b/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.
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index e7b7d9c3a..06662f03e 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -10,7 +10,6 @@ version = '1.12.0.dev0'
 install_requires = [
     'certbot',
     'certbot-apache',
-    'six',
     'requests',
     'zope.interface',
 ]
diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py
index d1e84710d..aea728068 100644
--- a/certbot-dns-digitalocean/setup.py
+++ b/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',
 ]
 
diff --git a/certbot/setup.py b/certbot/setup.py
index e1c86308e..d33ab81b1 100644
--- a/certbot/setup.py
+++ b/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
diff --git a/certbot/tests/log_test.py b/certbot/tests/log_test.py
index 2f6caade7..57addec3c 100644
--- a/certbot/tests/log_test.py
+++ b/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."""
diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt
index 1aabf6eeb..24b531b4a 100644
--- a/tools/oldest_constraints.txt
+++ b/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