diff options
| author | Hans Hörberg <hans.horberg@umu.se> | 2015-05-18 10:39:18 +0200 |
|---|---|---|
| committer | Hans Hörberg <hans.horberg@umu.se> | 2015-05-18 10:39:18 +0200 |
| commit | 9f076238a054666c2fcabe4391cf6edf520eae14 (patch) | |
| tree | f5e7835c28cea6281efa534c13b06a327b4aa5e2 /src/saml2/server.py | |
| parent | 2648e321d27eb0a27d06cdf03613c54c03578ea4 (diff) | |
| parent | f77763dd90f954694c8ec8f4b8df79bdf934d1e2 (diff) | |
| download | pysaml2-9f076238a054666c2fcabe4391cf6edf520eae14.tar.gz | |
Merge branch 'master' into test_new_encrypt
Diffstat (limited to 'src/saml2/server.py')
| -rw-r--r-- | src/saml2/server.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/saml2/server.py b/src/saml2/server.py index f876e286..4b8d20cb 100644 --- a/src/saml2/server.py +++ b/src/saml2/server.py @@ -10,6 +10,7 @@ import os import importlib import shelve +import six import threading from saml2 import saml @@ -89,7 +90,7 @@ class Server(Entity): _spec = self.config.getattr("session_storage", "idp") if not _spec: return SessionStorage() - elif isinstance(_spec, basestring): + elif isinstance(_spec, six.string_types): if _spec.lower() == "memory": return SessionStorage() else: # Should be tuple @@ -116,10 +117,10 @@ class Server(Entity): typ = "" if not dbspec: idb = {} - elif isinstance(dbspec, basestring): + elif isinstance(dbspec, six.string_types): idb = shelve.open(dbspec, writeback=True) else: # database spec is a a 2-tuple (type, address) - #print >> sys.stderr, "DBSPEC: %s" % (dbspec,) + #print(>> sys.stderr, "DBSPEC: %s" % (dbspec,)) (typ, addr) = dbspec if typ == "shelve": idb = shelve.open(addr, writeback=True) @@ -288,7 +289,7 @@ class Server(Entity): policy = Policy() try: ast.apply_policy(sp_entity_id, policy, self.metadata) - except MissingValue, exc: + except MissingValue as exc: if not best_effort: return self.create_error_response(in_response_to, consumer_url, exc, sign_response) @@ -566,7 +567,7 @@ class Server(Entity): name_id_policy) logger.debug("construct_nameid: %s => %s" % (userid, name_id)) - except IOError, exc: + except IOError as exc: response = self.create_error_response(in_response_to, destination, sp_entity_id, @@ -609,7 +610,7 @@ class Server(Entity): encrypted_advice_attributes=encrypted_advice_attributes, encrypt_cert=encrypt_cert) - except MissingValue, exc: + except MissingValue as exc: return self.create_error_response(in_response_to, destination, sp_entity_id, exc, name_id) @@ -768,4 +769,4 @@ class Server(Entity): except KeyError: pass - return lid
\ No newline at end of file + return lid |