Merge remote-tracking branch 'adv/python3-fix'

2017-07-23 13:11:37 +02:00 · 2017-07-23 13:11:37 +02:00 · 4311091d7d
commit 4311091d7d
parent 2e8a268dfa 85ce06850c
1 changed files with 4 additions and 1 deletions
--- a/cps/redirect.py
+++ b/cps/redirect.py
@ -1,6 +1,9 @@
 # http://flask.pocoo.org/snippets/62/

-from urlparse import urlparse, urljoin
+try:
+    from urllib.parse import urlparse, urljoin
+except ImportError:
+    from urlparse import urlparse, urljoin
 from flask import request, url_for, redirect