Merge remote-tracking branch 'adv/python3-fix'
This commit is contained in:
commit
4311091d7d
|
@ -1,6 +1,9 @@
|
||||||
# http://flask.pocoo.org/snippets/62/
|
# 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
|
from flask import request, url_for, redirect
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user