From 8e0a84efd5afa86d4aa0a09e027976887b8afdbe Mon Sep 17 00:00:00 2001
From: Roland Hedberg <roland@catalogix.se>
Date: Thu, 22 Sep 2016 18:36:39 +0200
Subject: [PATCH] Fixed cookie load problem

---
 example/idp2/idp.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index af8644f..fa5410f 100755
--- a/example/idp2/idp.py
+++ b/example/idp2/idp.py
@@ -7,14 +7,12 @@ import os
 import re
 import time
 
-#from Cookie import SimpleCookie
 from hashlib import sha1
-#from urlparse import parse_qs
 from cherrypy import wsgiserver
-#from cherrypy.wsgiserver import ssl_pyopenssl
 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 saml2 import BINDING_HTTP_ARTIFACT
 from saml2 import BINDING_URI
@@ -854,7 +852,12 @@ class NIM(Service):
 def info_from_cookie(kaka):
     logger.debug("KAKA: %s", kaka)
     if kaka:
-        cookie_obj = SimpleCookie(kaka)
+        cookie_obj = SimpleCookie()
+        if PY3:
+            import builtins
+            cookie_obj.load(builtins.str(kaka))
+        else:
+            cookie_obj.load(str(kaka))
         morsel = cookie_obj.get("idpauthn", None)
         if morsel:
             try: