summaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
authorRebecka Gulliksson <rebecka.gulliksson@umu.se>2016-09-23 08:12:58 +0200
committerRebecka Gulliksson <rebecka.gulliksson@umu.se>2016-09-23 08:12:58 +0200
commit6af78033aa368441fa53d94282850b51339daf32 (patch)
tree9cf5b4315a33106297165d572e34aadff8dba5ec /example
parentf6fcc9fda8294235c4068c51389b2d9f4a0ac48e (diff)
downloadpysaml2-6af78033aa368441fa53d94282850b51339daf32.tar.gz
Use six instead of futures for PY3 compatibility.
Diffstat (limited to 'example')
-rwxr-xr-xexample/idp2/idp.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index fa5410f5..41059b15 100755
--- a/example/idp2/idp.py
+++ b/example/idp2/idp.py
@@ -10,9 +10,9 @@ import time
from hashlib import sha1
from cherrypy import wsgiserver
from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter
-from future.backports.http.cookies import SimpleCookie
-from future.backports.urllib.parse import parse_qs
-from future.utils import PY3
+
+from six.moves.urllib.parse import parse_qs
+from six.moves.http_cookies import SimpleCookie
from saml2 import BINDING_HTTP_ARTIFACT
from saml2 import BINDING_URI
@@ -852,12 +852,7 @@ class NIM(Service):
def info_from_cookie(kaka):
logger.debug("KAKA: %s", kaka)
if kaka:
- cookie_obj = SimpleCookie()
- if PY3:
- import builtins
- cookie_obj.load(builtins.str(kaka))
- else:
- cookie_obj.load(str(kaka))
+ cookie_obj = SimpleCookie(kaka)
morsel = cookie_obj.get("idpauthn", None)
if morsel:
try: