Commit eed474a9 authored by Serge S. Koval's avatar Serge S. Koval

Python 3 fixes

parent 37781f41
...@@ -32,7 +32,7 @@ if not PY2: ...@@ -32,7 +32,7 @@ if not PY2:
# Various tools # Various tools
from functools import reduce from functools import reduce
from urllib.parse import urljoin from urllib.parse import urljoin, urlparse
else: else:
text_type = unicode text_type = unicode
string_types = (str, unicode) string_types = (str, unicode)
...@@ -50,7 +50,7 @@ else: ...@@ -50,7 +50,7 @@ else:
# Helpers # Helpers
reduce = __builtins__['reduce'] if isinstance(__builtins__, dict) else __builtins__.reduce reduce = __builtins__['reduce'] if isinstance(__builtins__, dict) else __builtins__.reduce
from urlparse import urljoin from urlparse import urljoin, urlparse
def with_metaclass(meta, *bases): def with_metaclass(meta, *bases):
......
from re import sub from re import sub
from urlparse import urlparse, urljoin
from jinja2 import contextfunction from jinja2 import contextfunction
from flask import g, request from flask import g, request
from wtforms.validators import DataRequired, InputRequired from wtforms.validators import DataRequired, InputRequired
from flask.ext.admin._compat import urljoin, urlparse
from ._compat import string_types from ._compat import string_types
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment