Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
eed474a9
Commit
eed474a9
authored
Jan 16, 2014
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Python 3 fixes
parent
37781f41
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
_compat.py
flask_admin/_compat.py
+2
-2
helpers.py
flask_admin/helpers.py
+2
-1
No files found.
flask_admin/_compat.py
View file @
eed474a9
...
@@ -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
):
...
...
flask_admin/helpers.py
View file @
eed474a9
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment