From 8c39e92d850be1b3280a75cf78093e9878c9b0f7 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 5 Jan 2011 09:36:41 +0000 Subject: [PATCH] Call subtasks correctly --- eve_api/tasks/account.py | 4 ++-- eve_api/tasks/character.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eve_api/tasks/account.py b/eve_api/tasks/account.py index 9a8ad80..69a1e7a 100644 --- a/eve_api/tasks/account.py +++ b/eve_api/tasks/account.py @@ -113,7 +113,7 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False): charlist = set(account.characters.all().values_list('id', flat=True)) newcharlist = [] for char in doc['result']['characters']: - tasklist.append(import_eve_character.subtask(char['characterID'], api_key, api_userid)) + tasklist.append(import_eve_character.subtask(args=(char['characterID'], api_key, api_userid))) newcharlist.append(int(char['characterID'])) toremove = charlist - set(newcharlist) @@ -122,7 +122,7 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False): # If we have a user, update their details in the taskset if account.user: - tasklist.append(update_user_access.subtask(user=account.user.id)) + tasklist.append(update_user_access.subtask(kwargs={'user': account.user.id })) ts = TaskSet(tasks=tasklist) ts.apply_async() diff --git a/eve_api/tasks/character.py b/eve_api/tasks/character.py index e1bf27b..dd676b3 100644 --- a/eve_api/tasks/character.py +++ b/eve_api/tasks/character.py @@ -98,7 +98,7 @@ def import_eve_character(character_id, api_key=None, user_id=None, callback=None try: acc = EVEAccount.objects.get(api_user_id=user_id) - if not char in acc.characters.all(): + if not pchar in acc.characters.all(): acc.characters.add(pchar) if pchar.director and acc.api_keytype == API_KEYTYPE_FULL: