Remove Six dependency

Author: akx

pyproject.toml

@@ -48,7 +48,6 @@ python-dateutil = "*"
 pytz = "*"
 "repoze.who" = {optional = true, version = "*"}
 requests = "^2"
-six = "*"
 xmlschema = ">=1.2.1"
 "zope.interface" = {optional = true, version = "*"}
 

src/saml2/__init__.py

@@ -18,8 +18,6 @@
 
 import logging
 
-import six
-
 from saml2.validate import valid_instance
 from saml2.version import version as __version__
 

src/saml2/eptid.py

@@ -8,8 +8,6 @@
 import logging
 import shelve
 
-import six
-
 
 logger = logging.getLogger(__name__)
 
@@ -38,12 +36,12 @@ def make(self, idp, sp, args):
         return "!".join([idp, sp, hashval])
 
     def __getitem__(self, key):
-        if six.PY3 and isinstance(key, bytes):
+        if isinstance(key, bytes):
             key = key.decode("utf-8")
         return self._db[key]
 
     def __setitem__(self, key, value):
-        if six.PY3 and isinstance(key, bytes):
+        if isinstance(key, bytes):
             key = key.decode("utf-8")
         self._db[key] = value
 

src/saml2/httpbase.py

@@ -1,5 +1,6 @@
 import calendar
 import copy
+import http.cookiejar as http_cookiejar
 from http.cookies import SimpleCookie
 import logging
 import re
@@ -8,7 +9,6 @@
 from urllib.parse import urlparse
 
 import requests
-from six.moves import http_cookiejar
 
 from saml2 import SAMLError
 from saml2 import class_name

src/saml2/metadata.py

@@ -276,7 +276,7 @@ def do_uiinfo(_uiinfo):
         _attr = "keywords"
         val = _uiinfo[_attr]
         inst = getattr(uii, _attr)
-        # list of six.string_types, dictionary or list of dictionaries
+        # list of strings, bytes, dictionary or list of dictionaries
         if isinstance(val, list):
             for value in val:
                 keyw = mdui.Keywords()

src/saml2/saml.py

@@ -228,7 +228,6 @@ def _wrong_type_value(xsd, value):
             msg = msg.format(xsd=xsd, type=type(value), value=value)
             raise ValueError(msg)
 
-        # only work with six.string_types
         if isinstance(value, bytes):
             value = value.decode("utf-8")