summaryrefslogtreecommitdiff
path: root/src/saml2
diff options
context:
space:
mode:
Diffstat (limited to 'src/saml2')
-rw-r--r--src/saml2/__init__.py2
-rw-r--r--src/saml2/assertion.py2
-rw-r--r--src/saml2/authn.py2
-rw-r--r--src/saml2/cache.py2
-rw-r--r--src/saml2/cert.py1
-rw-r--r--src/saml2/client.py1
-rw-r--r--src/saml2/client_base.py2
-rw-r--r--src/saml2/entity.py2
-rw-r--r--src/saml2/httputil.py2
-rw-r--r--src/saml2/ident.py2
-rw-r--r--src/saml2/mdie.py1
-rw-r--r--src/saml2/mdstore.py1
-rw-r--r--src/saml2/metadata.py1
-rw-r--r--src/saml2/mongo_store.py2
-rw-r--r--src/saml2/pack.py2
-rw-r--r--src/saml2/population.py2
-rw-r--r--src/saml2/request.py3
-rw-r--r--src/saml2/response.py2
-rw-r--r--src/saml2/s2repoze/plugins/sp.py2
-rw-r--r--src/saml2/s_utils.py2
-rw-r--r--src/saml2/saml.py2
-rw-r--r--src/saml2/server.py2
-rw-r--r--src/saml2/sigver.py4
-rw-r--r--src/saml2/time_util.py2
-rw-r--r--src/saml2/tools/parse_xsd2.py2
25 files changed, 0 insertions, 48 deletions
diff --git a/src/saml2/__init__.py b/src/saml2/__init__.py
index 0e38e551..6259373c 100644
--- a/src/saml2/__init__.py
+++ b/src/saml2/__init__.py
@@ -136,8 +136,6 @@ def create_class_from_element_tree(target_class, tree, namespace=None, tag=None)
class Error(Exception):
"""Exception class thrown by this module."""
- pass
-
class SAMLError(Exception):
pass
diff --git a/src/saml2/assertion.py b/src/saml2/assertion.py
index 40ae7112..08c4f908 100644
--- a/src/saml2/assertion.py
+++ b/src/saml2/assertion.py
@@ -5,8 +5,6 @@ import logging
import re
from warnings import warn as _warn
-import six
-
from saml2 import saml
from saml2 import xmlenc
from saml2.attribute_converter import ac_factory
diff --git a/src/saml2/authn.py b/src/saml2/authn.py
index 1ed41152..a7ef3355 100644
--- a/src/saml2/authn.py
+++ b/src/saml2/authn.py
@@ -4,8 +4,6 @@ from urllib.parse import parse_qs
from urllib.parse import urlencode
from urllib.parse import urlsplit
-import six
-
from saml2 import SAMLError
import saml2.cryptography.symmetric
from saml2.httputil import Redirect
diff --git a/src/saml2/cache.py b/src/saml2/cache.py
index 172afe98..56351fe7 100644
--- a/src/saml2/cache.py
+++ b/src/saml2/cache.py
@@ -3,8 +3,6 @@
import logging
import shelve
-import six
-
from saml2 import SAMLError
from saml2 import time_util
from saml2.ident import code
diff --git a/src/saml2/cert.py b/src/saml2/cert.py
index 08f0bd25..247b9f56 100644
--- a/src/saml2/cert.py
+++ b/src/saml2/cert.py
@@ -8,7 +8,6 @@ from os.path import join
from OpenSSL import crypto
import dateutil.parser
import pytz
-import six
import saml2.cryptography.pki
diff --git a/src/saml2/client.py b/src/saml2/client.py
index 018ae6ef..4f947954 100644
--- a/src/saml2/client.py
+++ b/src/saml2/client.py
@@ -1,6 +1,5 @@
# !/usr/bin/env python
#
-import six
"""Contains classes and functions that a SAML2.0 Service Provider (SP) may use
diff --git a/src/saml2/client_base.py b/src/saml2/client_base.py
index 146ae45c..8b548c44 100644
--- a/src/saml2/client_base.py
+++ b/src/saml2/client_base.py
@@ -13,8 +13,6 @@ from urllib.parse import urlencode
from urllib.parse import urlparse
from warnings import warn as _warn
-import six
-
import saml2
from saml2 import BINDING_HTTP_POST
from saml2 import BINDING_HTTP_REDIRECT
diff --git a/src/saml2/entity.py b/src/saml2/entity.py
index b56388d9..f826177e 100644
--- a/src/saml2/entity.py
+++ b/src/saml2/entity.py
@@ -5,7 +5,6 @@ from hashlib import sha1
import logging
import requests
-import six
from saml2 import BINDING_HTTP_ARTIFACT
from saml2 import BINDING_HTTP_POST
@@ -674,7 +673,6 @@ class Entity(HTTPBase):
return response
except Exception as ex:
exception = ex
- pass
if exception:
raise exception
return response
diff --git a/src/saml2/httputil.py b/src/saml2/httputil.py
index e0d9bd24..5ff1282d 100644
--- a/src/saml2/httputil.py
+++ b/src/saml2/httputil.py
@@ -7,8 +7,6 @@ import time
from urllib.parse import parse_qs
from urllib.parse import quote
-import six
-
from saml2 import BINDING_HTTP_ARTIFACT
from saml2 import BINDING_HTTP_POST
from saml2 import BINDING_HTTP_REDIRECT
diff --git a/src/saml2/ident.py b/src/saml2/ident.py
index d94dd756..3a05c1d8 100644
--- a/src/saml2/ident.py
+++ b/src/saml2/ident.py
@@ -5,8 +5,6 @@ import shelve
from urllib.parse import quote
from urllib.parse import unquote
-import six
-
from saml2 import SAMLError
from saml2.s_utils import PolicyError
from saml2.s_utils import rndbytes
diff --git a/src/saml2/mdie.py b/src/saml2/mdie.py
index c5d30557..ae81d71f 100644
--- a/src/saml2/mdie.py
+++ b/src/saml2/mdie.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-import six
from saml2 import ExtensionElement
from saml2 import SamlBase
diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
index 8dc9e636..95ab0945 100644
--- a/src/saml2/mdstore.py
+++ b/src/saml2/mdstore.py
@@ -12,7 +12,6 @@ import sys
from warnings import warn as _warn
import requests
-import six
from saml2 import BINDING_HTTP_POST
from saml2 import BINDING_HTTP_REDIRECT
diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py
index 707e1d54..d87be05f 100644
--- a/src/saml2/metadata.py
+++ b/src/saml2/metadata.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-import six
from saml2 import BINDING_HTTP_POST
from saml2 import BINDING_HTTP_REDIRECT
diff --git a/src/saml2/mongo_store.py b/src/saml2/mongo_store.py
index 230a0d09..23729237 100644
--- a/src/saml2/mongo_store.py
+++ b/src/saml2/mongo_store.py
@@ -6,7 +6,6 @@ from pymongo import MongoClient
import pymongo.errors
from pymongo.mongo_replica_set_client import MongoReplicaSetClient
import pymongo.uri_parser
-import six
from saml2.eptid import Eptid
from saml2.ident import IdentDB
@@ -280,7 +279,6 @@ def _mdb_get_database(uri, **kwargs):
# assume URI to be just the database name
db_name = uri
_conn = MongoClient()
- pass
else:
if "replicaset" in _parsed_uri["options"]:
connection_factory = MongoReplicaSetClient
diff --git a/src/saml2/pack.py b/src/saml2/pack.py
index f8328b5c..30b9cdf9 100644
--- a/src/saml2/pack.py
+++ b/src/saml2/pack.py
@@ -19,8 +19,6 @@ import logging
from urllib.parse import urlencode
from urllib.parse import urlparse
-import six
-
import saml2
from saml2.s_utils import deflate_and_base64_encode
from saml2.sigver import REQ_ORDER
diff --git a/src/saml2/population.py b/src/saml2/population.py
index 8c066d63..ff3928b4 100644
--- a/src/saml2/population.py
+++ b/src/saml2/population.py
@@ -1,7 +1,5 @@
import logging
-import six
-
from saml2.cache import Cache
diff --git a/src/saml2/request.py b/src/saml2/request.py
index 6b8474e6..e013e058 100644
--- a/src/saml2/request.py
+++ b/src/saml2/request.py
@@ -254,15 +254,12 @@ class AuthzDecisionQuery(Request):
def action(self):
"""Which action authorization is requested for"""
- pass
def evidence(self):
"""The evidence on which the decision is based"""
- pass
def resource(self):
"""On which resource the action is expected to occur"""
- pass
class NameIDMappingRequest(Request):
diff --git a/src/saml2/response.py b/src/saml2/response.py
index d6500336..7d51ce6d 100644
--- a/src/saml2/response.py
+++ b/src/saml2/response.py
@@ -3,8 +3,6 @@
import calendar
import logging
-import six
-
from saml2 import SAMLError
from saml2 import class_name
from saml2 import extension_elements_to_elements
diff --git a/src/saml2/s2repoze/plugins/sp.py b/src/saml2/s2repoze/plugins/sp.py
index e3d25bfe..9d107795 100644
--- a/src/saml2/s2repoze/plugins/sp.py
+++ b/src/saml2/s2repoze/plugins/sp.py
@@ -23,7 +23,6 @@ from repoze.who.interfaces import IAuthenticator
from repoze.who.interfaces import IChallenger
from repoze.who.interfaces import IIdentifier
from repoze.who.interfaces import IMetadataProvider
-import six
from zope.interface import implementer
from saml2 import BINDING_HTTP_POST
@@ -219,7 +218,6 @@ class SAML2Plugin:
break
except KeyError:
logger.debug("No IdP entity ID in query: %s", query)
- pass
if idp_entity_id is None:
if len(idps) == 1:
diff --git a/src/saml2/s_utils.py b/src/saml2/s_utils.py
index 1df61572..e8fadfa1 100644
--- a/src/saml2/s_utils.py
+++ b/src/saml2/s_utils.py
@@ -10,8 +10,6 @@ import sys
import traceback
import zlib
-import six
-
from saml2 import VERSION
from saml2 import saml
from saml2 import samlp
diff --git a/src/saml2/saml.py b/src/saml2/saml.py
index d3cca114..a2678b7b 100644
--- a/src/saml2/saml.py
+++ b/src/saml2/saml.py
@@ -18,8 +18,6 @@ import base64
from datetime import date
from datetime import datetime
-import six
-
import saml2
from saml2 import SamlBase
from saml2 import xmldsig as ds
diff --git a/src/saml2/server.py b/src/saml2/server.py
index 153ea91b..8b557200 100644
--- a/src/saml2/server.py
+++ b/src/saml2/server.py
@@ -10,8 +10,6 @@ import logging
import shelve
import threading
-import six
-
from saml2 import BINDING_HTTP_REDIRECT
from saml2 import class_name
from saml2 import element_to_extension_element
diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
index 06836cf6..cae27914 100644
--- a/src/saml2/sigver.py
+++ b/src/saml2/sigver.py
@@ -17,7 +17,6 @@ from time import mktime
from uuid import uuid4 as gen_random_key
import dateutil
-import six
# importlib.resources was introduced in python 3.7
@@ -110,8 +109,6 @@ class SignatureError(XmlsecError):
class BadSignature(SigverError):
"""The signature is invalid."""
- pass
-
def get_pem_wrapped_unwrapped(cert):
begin_cert = "-----BEGIN CERTIFICATE-----\n"
@@ -1497,7 +1494,6 @@ class SecurityContext:
break
except XmlsecError as exc:
logger.error("check_sig: %s", str(exc))
- pass
except Exception as exc:
logger.error("check_sig: %s", str(exc))
raise
diff --git a/src/saml2/time_util.py b/src/saml2/time_util.py
index 2ef2adb6..37cd2319 100644
--- a/src/saml2/time_util.py
+++ b/src/saml2/time_util.py
@@ -12,8 +12,6 @@ import re
import sys
import time
-import six
-
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
TIME_FORMAT_WITH_FRAGMENT = re.compile(r"^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})(\.\d*)?Z?$")
diff --git a/src/saml2/tools/parse_xsd2.py b/src/saml2/tools/parse_xsd2.py
index ce9f433f..432f25a7 100644
--- a/src/saml2/tools/parse_xsd2.py
+++ b/src/saml2/tools/parse_xsd2.py
@@ -8,8 +8,6 @@ import sys
import time
import types
-import six
-
__version__ = 0.5
View Lorry Controller Status