Commit 30a1f9bf authored by Serge S. Koval's avatar Serge S. Koval

Python 3 fixes

parent 845f6588
...@@ -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):
......
...@@ -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):
......
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