diff options
author | Aarni Koskela <akx@iki.fi> | 2022-10-27 15:16:57 +0300 |
---|---|---|
committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2022-11-15 13:06:41 +0200 |
commit | b18599693aede393d41c5ee24b27e6bc42775559 (patch) | |
tree | e79b32707af475ba2bb3ca6ee391bb4a9023c8fd | |
parent | fc84d5103a0ede07d1f371a4c85f2abaf0f8f3c0 (diff) | |
download | pysaml2-b18599693aede393d41c5ee24b27e6bc42775559.tar.gz |
Remove Six dependency
-rw-r--r-- | pyproject.toml | 1 | ||||
-rw-r--r-- | src/saml2/__init__.py | 2 | ||||
-rw-r--r-- | src/saml2/eptid.py | 6 | ||||
-rw-r--r-- | src/saml2/httpbase.py | 2 | ||||
-rw-r--r-- | src/saml2/metadata.py | 2 | ||||
-rw-r--r-- | src/saml2/saml.py | 1 |
6 files changed, 4 insertions, 10 deletions
diff --git a/pyproject.toml b/pyproject.toml index c61fa3b9..92c0b66f 100644 --- a/pyproject.toml +++ b/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 = "*"} diff --git a/src/saml2/__init__.py b/src/saml2/__init__.py index 72352caa..8fc5ecd9 100644 --- a/src/saml2/__init__.py +++ b/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__ diff --git a/src/saml2/eptid.py b/src/saml2/eptid.py index 65108d4c..b6186fde 100644 --- a/src/saml2/eptid.py +++ b/src/saml2/eptid.py @@ -8,8 +8,6 @@ import hashlib import logging import shelve -import six - logger = logging.getLogger(__name__) @@ -38,12 +36,12 @@ class Eptid: 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 diff --git a/src/saml2/httpbase.py b/src/saml2/httpbase.py index 11685d4f..5a1d9926 100644 --- a/src/saml2/httpbase.py +++ b/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 urlencode from urllib.parse import urlparse import requests -from six.moves import http_cookiejar from saml2 import SAMLError from saml2 import class_name diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py index 9ac8d69c..47823406 100644 --- a/src/saml2/metadata.py +++ b/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() diff --git a/src/saml2/saml.py b/src/saml2/saml.py index a2678b7b..1c01dc16 100644 --- a/src/saml2/saml.py +++ b/src/saml2/saml.py @@ -228,7 +228,6 @@ class AttributeValueBase(SamlBase): 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") |