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

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