diff --git a/eve_api/tasks/account.py b/eve_api/tasks/account.py index 2f281db..18f1a17 100644 --- a/eve_api/tasks/account.py +++ b/eve_api/tasks/account.py @@ -111,9 +111,9 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False): # Process the account's character list charlist = set(account.characters.all().values_list('id', flat=True)) - newcharlist = [char['characterID'] char in doc['result']['characters']] + newcharlist = [char['characterID'] for char in doc['result']['characters']] - for char in account.characters.filter(id__in=set(charlist - set(newcharlist)): + for char in account.characters.filter(id__in=set(charlist - set(newcharlist))): account.characters.remove(char) if account.user: diff --git a/eve_api/tasks/character.py b/eve_api/tasks/character.py index 5ee4e9c..f430a83 100644 --- a/eve_api/tasks/character.py +++ b/eve_api/tasks/character.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from xml.dom import minidom from celery.decorators import task -from celery.task.set import subtask +from celery.task.sets import subtask from eve_proxy.models import CachedDocument diff --git a/sso/tasks.py b/sso/tasks.py index 4a41ced..3da4bb1 100644 --- a/sso/tasks.py +++ b/sso/tasks.py @@ -13,7 +13,7 @@ signals.post_delete.connect(eveapi_deleted, sender=EVEAccount) @task() -def update_user_access(user): +def update_user_access(user, **kwargs): """ Process all corporate and alliance entries and correct access groups """ user = User.objects.get(id=user)