0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests 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

2
pandora/user/tasks.py
View file

@ -28,7 +28,7 @@ def update_statistics():
for i in models.SessionData.objects.filter(level__gte=0).values('session_key')]
for chunk in chunker(ids, 100, None):
chunk = filter(None, chunk)
chunk = list(filter(None, chunk))
for u in models.SessionData.objects.filter(pk__in=chunk):
stats.add(u.json())
Settings.set('statistics', stats)

4
pandora/user/views.py
View file

@ -370,12 +370,12 @@ def editUser(request, data):
if 'groups' in data:
groups = data['groups']
if isinstance(groups, list):
groups = filter(lambda g: g.strip(), groups)
groups = list(filter(lambda g: g.strip(), groups))
groups = [ox.escape_html(g) for g in groups]
for g in user.groups.exclude(name__in=groups):
user.groups.remove(g)
current_groups = [g.name for g in user.groups.all()]
for g in filter(lambda g: g not in current_groups, groups):
for g in list(filter(lambda g: g not in current_groups, groups)):
group, created = Group.objects.get_or_create(name=g)
user.groups.add(group)
if 'username' in data: