From 6af78033aa368441fa53d94282850b51339daf32 Mon Sep 17 00:00:00 2001
From: Rebecka Gulliksson <rebecka.gulliksson@umu.se>
Date: Fri, 23 Sep 2016 08:12:58 +0200
Subject: [PATCH] Use six instead of futures for PY3 compatibility.

---
 example/idp2/idp.py   | 13 ++++---------
 src/saml2/httputil.py |  5 ++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index fa5410f..41059b1 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:
diff --git a/src/saml2/httputil.py b/src/saml2/httputil.py
index d65a5e8..0901f7b 100644
--- a/src/saml2/httputil.py
+++ b/src/saml2/httputil.py
@@ -5,9 +5,8 @@ import time
 import cgi
 import six
 
-from future.backports.http.cookies import SimpleCookie
-from future.backports.urllib.parse import quote
-from future.backports.urllib.parse import parse_qs
+from six.moves.urllib.parse import quote, parse_qs
+from six.moves.http_cookies import SimpleCookie
 
 from saml2 import BINDING_HTTP_ARTIFACT
 from saml2 import BINDING_HTTP_REDIRECT