openstack
/
deb-python-pysaml2
Code Issues Proposed changes

Use six instead of futures for PY3 compatibility.

This commit is contained in:
Rebecka Gulliksson 2016-09-23 08:12:58 +02:00
parent f6fcc9fda8
commit 6af78033aa
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
example/idp2/idp.py
View File

@ -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:

5
src/saml2/httputil.py
View File

@ -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