From 1bdbb4bae0ff355ed81ba74d86a6b78a5a750e43 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 1 Feb 2021 16:40:35 -0800
Subject: [PATCH] remove some six usage in acme

---
 acme/acme/challenges.py        | 4 +---
 acme/acme/client.py            | 4 ++--
 acme/acme/messages.py          | 1 -
 acme/acme/standalone.py        | 7 +++----
 acme/tests/challenges_test.py  | 2 +-
 acme/tests/client_test.py      | 2 +-
 acme/tests/crypto_util_test.py | 2 +-
 acme/tests/standalone_test.py  | 4 ++--
 8 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py
index 376e9a382..41a2aa258 100644
--- a/acme/acme/challenges.py
+++ b/acme/acme/challenges.py
@@ -9,7 +9,6 @@ import socket
 from cryptography.hazmat.primitives import hashes  # type: ignore
 import josepy as jose
 import requests
-import six
 from OpenSSL import SSL  # type: ignore # https://github.com/python/typeshed/issues/2052
 from OpenSSL import crypto
 
@@ -145,8 +144,7 @@ class KeyAuthorizationChallengeResponse(ChallengeResponse):
         return jobj
 
 
-@six.add_metaclass(abc.ABCMeta)
-class KeyAuthorizationChallenge(_TokenChallenge):
+class KeyAuthorizationChallenge(_TokenChallenge, metaclass=abc.ABCMeta):
     """Challenge based on Key Authorization.
 
     :param response_cls: Subclass of `KeyAuthorizationChallengeResponse`
diff --git a/acme/acme/client.py b/acme/acme/client.py
index d413ce13d..75b0bdc1a 100644
--- a/acme/acme/client.py
+++ b/acme/acme/client.py
@@ -4,6 +4,7 @@ import collections
 import datetime
 from email.utils import parsedate_tz
 import heapq
+import http.client as http_client
 import logging
 import re
 import sys
@@ -16,7 +17,6 @@ from requests.adapters import HTTPAdapter
 from requests.utils import parse_header_links
 from requests_toolbelt.adapters.source import SourceAddressAdapter
 import six
-from six.moves import http_client
 
 from acme import crypto_util
 from acme import errors
@@ -260,7 +260,7 @@ class Client(ClientBase):
         if net is None:
             net = ClientNetwork(key, alg=alg, verify_ssl=verify_ssl)
 
-        if isinstance(directory, six.string_types):
+        if isinstance(directory, str):
             directory = messages.Directory.from_json(
                 net.get(directory).json())
         super(Client, self).__init__(directory=directory,
diff --git a/acme/acme/messages.py b/acme/acme/messages.py
index 3a505843d..1c9472aa7 100644
--- a/acme/acme/messages.py
+++ b/acme/acme/messages.py
@@ -68,7 +68,6 @@ def is_acme_error(err):
     return False
 
 
-@six.python_2_unicode_compatible
 class Error(jose.JSONObjectWithFields, errors.Error):
     """ACME error.
 
diff --git a/acme/acme/standalone.py b/acme/acme/standalone.py
index 7a61ba868..94397f0de 100644
--- a/acme/acme/standalone.py
+++ b/acme/acme/standalone.py
@@ -1,14 +1,13 @@
 """Support for standalone client challenge solvers. """
 import collections
 import functools
+import http.client as http_client
+import http.server as BaseHTTPServer
 import logging
 import socket
+import socketserver
 import threading
 
-from six.moves import BaseHTTPServer  # type: ignore
-from six.moves import http_client
-from six.moves import socketserver  # type: ignore
-
 from acme import challenges
 from acme import crypto_util
 from acme.magic_typing import List
diff --git a/acme/tests/challenges_test.py b/acme/tests/challenges_test.py
index 70371051c..e9cc7413c 100644
--- a/acme/tests/challenges_test.py
+++ b/acme/tests/challenges_test.py
@@ -1,4 +1,5 @@
 """Tests for acme.challenges."""
+import urllib.parse as urllib_parse
 import unittest
 
 import josepy as jose
@@ -8,7 +9,6 @@ try:
 except ImportError: # pragma: no cover
     from unittest import mock # type: ignore
 import requests
-from six.moves.urllib import parse as urllib_parse
 
 from acme import errors
 
diff --git a/acme/tests/client_test.py b/acme/tests/client_test.py
index c84878c42..9281c07df 100644
--- a/acme/tests/client_test.py
+++ b/acme/tests/client_test.py
@@ -2,6 +2,7 @@
 # pylint: disable=too-many-lines
 import copy
 import datetime
+import http.client as http_client
 import json
 import unittest
 
@@ -12,7 +13,6 @@ except ImportError: # pragma: no cover
     from unittest import mock # type: ignore
 import OpenSSL
 import requests
-from six.moves import http_client  # pylint: disable=import-error
 
 from acme import challenges
 from acme import errors
diff --git a/acme/tests/crypto_util_test.py b/acme/tests/crypto_util_test.py
index 705a3c856..ef76230a0 100644
--- a/acme/tests/crypto_util_test.py
+++ b/acme/tests/crypto_util_test.py
@@ -1,6 +1,7 @@
 """Tests for acme.crypto_util."""
 import itertools
 import socket
+import socketserver
 import threading
 import time
 import unittest
@@ -8,7 +9,6 @@ import unittest
 import josepy as jose
 import OpenSSL
 import six
-from six.moves import socketserver  # type: ignore  # pylint: disable=import-error
 
 from acme import errors
 import test_util
diff --git a/acme/tests/standalone_test.py b/acme/tests/standalone_test.py
index 3d068fb46..ae922fb88 100644
--- a/acme/tests/standalone_test.py
+++ b/acme/tests/standalone_test.py
@@ -1,5 +1,7 @@
 """Tests for acme.standalone."""
+import http.client as http_client
 import socket
+import socketserver
 import threading
 import unittest
 
@@ -9,8 +11,6 @@ try:
 except ImportError: # pragma: no cover
     from unittest import mock # type: ignore
 import requests
-from six.moves import http_client  # pylint: disable=import-error
-from six.moves import socketserver  # type: ignore  # pylint: disable=import-error
 
 from acme import challenges
 from acme import crypto_util