decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

py3 filter->list(filter

Browse source
This commit is contained in:
j 2017-02-16 14:24:51 +01:00
commit 12f3901c9a
17 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/models.py
View file

@ -36,7 +36,7 @@ def get_super_matches(obj, model):
def get_matches(obj, model, layer_type, qs=None):
super_matches = obj.get_super_matches()
exact = [l['id'] for l in filter(lambda l: l['type'] == layer_type, settings.CONFIG['layers'])]
exact = [l['id'] for l in list(filter(lambda l: l['type'] == layer_type, settings.CONFIG['layers']))]
if exact:
q = Q(value__iexact=obj.name)
for name in obj.alternativeNames:
@ -46,7 +46,7 @@ def get_matches(obj, model, layer_type, qs=None):
f = None
has_type = 'has%ss' % layer_type.capitalize()
contains = [l['id'] for l in filter(lambda l: l.get(has_type), settings.CONFIG['layers'])]
contains = [l['id'] for l in list(filter(lambda l: l.get(has_type), settings.CONFIG['layers']))]
if contains:
name = ox.decode_html(obj.name)
name = unicodedata.normalize('NFKD', name).lower()