1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 01:50:31 +00:00

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

This commit is contained in:
OzzieIsaacs 2017-07-23 13:11:37 +02:00
commit 4311091d7d

View File

@ -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