From 8729b3c625f9914a23dddd9edbef7584e849f40c Mon Sep 17 00:00:00 2001
From: jurov <rini17@gmail.com>
Date: Mon, 15 Dec 2014 20:12:32 +0100
Subject: [PATCH] Merged with master, fixed imports for py3

---
 repoze/who/plugins/auth_tkt.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/repoze/who/plugins/auth_tkt.py b/repoze/who/plugins/auth_tkt.py
index b42e9a3..1c551b1 100644
--- a/repoze/who/plugins/auth_tkt.py
+++ b/repoze/who/plugins/auth_tkt.py
@@ -7,8 +7,11 @@
 import time
 from wsgiref.handlers import _monthname     # Locale-independent, RFC-2616
 from wsgiref.handlers import _weekdayname   # Locale-independent, RFC-2616
-from urllib import urlencode
-from urlparse import parse_qsl
+try:
+    from urllib.parse import urlencode, parse_qsl
+except ImportError:
+    from urllib import urlencode
+    from urlparse import parse_qsl
 
 from zope.interface import implementer
 

--
Gitblit v1.9.3