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
30a1f9bf
Commit
30a1f9bf
authored
May 24, 2014
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Python 3 fixes
parent
845f6588
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
_compat.py
flask_admin/_compat.py
+2
-0
tools.py
flask_admin/contrib/sqla/tools.py
+2
-1
No files found.
flask_admin/_compat.py
View file @
30a1f9bf
...
@@ -23,6 +23,7 @@ if not PY2:
...
@@ -23,6 +23,7 @@ if not PY2:
iterkeys
=
lambda
d
:
iter
(
d
.
keys
())
iterkeys
=
lambda
d
:
iter
(
d
.
keys
())
itervalues
=
lambda
d
:
iter
(
d
.
values
())
itervalues
=
lambda
d
:
iter
(
d
.
values
())
iteritems
=
lambda
d
:
iter
(
d
.
items
())
iteritems
=
lambda
d
:
iter
(
d
.
items
())
filter_list
=
lambda
f
,
l
:
list
(
filter
(
f
,
l
))
def
as_unicode
(
s
):
def
as_unicode
(
s
):
if
isinstance
(
s
,
bytes
):
if
isinstance
(
s
,
bytes
):
...
@@ -41,6 +42,7 @@ else:
...
@@ -41,6 +42,7 @@ else:
iterkeys
=
lambda
d
:
d
.
iterkeys
()
iterkeys
=
lambda
d
:
d
.
iterkeys
()
itervalues
=
lambda
d
:
d
.
itervalues
()
itervalues
=
lambda
d
:
d
.
itervalues
()
iteritems
=
lambda
d
:
d
.
iteritems
()
iteritems
=
lambda
d
:
d
.
iteritems
()
filter_list
=
filter
def
as_unicode
(
s
):
def
as_unicode
(
s
):
if
isinstance
(
s
,
str
):
if
isinstance
(
s
,
str
):
...
...
flask_admin/contrib/sqla/tools.py
View file @
30a1f9bf
...
@@ -3,6 +3,7 @@ from sqlalchemy.sql.operators import eq
...
@@ -3,6 +3,7 @@ from sqlalchemy.sql.operators import eq
from
sqlalchemy.exc
import
DBAPIError
from
sqlalchemy.exc
import
DBAPIError
from
ast
import
literal_eval
from
ast
import
literal_eval
from
flask.ext.admin._compat
import
filter_list
from
flask.ext.admin.tools
import
iterencode
,
iterdecode
from
flask.ext.admin.tools
import
iterencode
,
iterdecode
...
@@ -24,7 +25,7 @@ def filter_foreign_columns(base_table, columns):
...
@@ -24,7 +25,7 @@ def filter_foreign_columns(base_table, columns):
:param base_table: Table to check against
:param base_table: Table to check against
:param columns: List of columns to filter
:param columns: List of columns to filter
"""
"""
return
filter
(
lambda
c
:
c
.
table
==
base_table
,
columns
)
return
filter
_list
(
lambda
c
:
c
.
table
==
base_table
,
columns
)
def
get_primary_key
(
model
):
def
get_primary_key
(
model
):
...
...
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