diff options
Diffstat (limited to 'example')
-rwxr-xr-x | example/sp-wsgi/sp.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/example/sp-wsgi/sp.py b/example/sp-wsgi/sp.py index 41b7ceea..77345bca 100755 --- a/example/sp-wsgi/sp.py +++ b/example/sp-wsgi/sp.py @@ -65,10 +65,7 @@ def dict_to_table(ava, lev=0, width=1): txt.append("<tr>\n") if isinstance(valarr, six.string_types): txt.append("<th>%s</th>\n" % str(prop)) - try: - txt.append("<td>%s</td>\n" % valarr.encode("utf8")) - except AttributeError: - txt.append("<td>%s</td>\n" % valarr) + txt.append("<td>%s</td>\n" % valarr) elif isinstance(valarr, list): i = 0 n = len(valarr) @@ -82,10 +79,7 @@ def dict_to_table(ava, lev=0, width=1): txt.extend(dict_to_table(val, lev + 1, width - 1)) txt.append("</td>\n") else: - try: - txt.append("<td>%s</td>\n" % val.encode("utf8")) - except AttributeError: - txt.append("<td>%s</td>\n" % val) + txt.append("<td>%s</td>\n" % val) if n > 1: txt.append("</tr>\n") n -= 1 @@ -206,7 +200,7 @@ class Cache(object): cookie[self.cookie_name]['path'] = "/" cookie[self.cookie_name]["expires"] = _expiration(480) logger.debug("Cookie expires: %s", cookie[self.cookie_name]["expires"]) - return cookie.output().encode("UTF-8").split(": ", 1) + return cookie.output().split(": ", 1) # ----------------------------------------------------------------------------- @@ -230,12 +224,9 @@ class Service(object): return None def unpack_post(self): - _dict = parse_qs(get_post(self.environ)) + _dict = parse_qs(get_post(self.environ).decode('utf8')) logger.debug("unpack_post:: %s", _dict) - try: - return dict([(k, v[0]) for k, v in _dict.items()]) - except Exception: - return None + return dict([(k, v[0]) for k, v in _dict.items()]) def unpack_soap(self): try: @@ -544,7 +535,7 @@ class SSO(object): return -1, SeeOther(loc) elif len(idps) == 1: # idps is a dictionary - idp_entity_id = idps.keys()[0] + idp_entity_id = list(idps.keys())[0] elif not len(idps): return -1, ServiceError('Misconfiguration') else: |