nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call subtasks correctly

Browse Source
This commit is contained in:
Andrew Williams
2011-01-05 09:36:41 +00:00
parent 4d01d20f1d
commit 8c39e92d85
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eve_api/tasks/account.py
View File

@@ -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)) charlist = set(account.characters.all().values_list('id', flat=True))
newcharlist = [] newcharlist = []
for char in doc['result']['characters']: 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'])) newcharlist.append(int(char['characterID']))
toremove = charlist - set(newcharlist) 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 we have a user, update their details in the taskset
if account.user: 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 = TaskSet(tasks=tasklist)
ts.apply_async() ts.apply_async()

2
eve_api/tasks/character.py
View File

@@ -98,7 +98,7 @@ def import_eve_character(character_id, api_key=None, user_id=None, callback=None
try: try:
acc = EVEAccount.objects.get(api_user_id=user_id) 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) acc.characters.add(pchar)
if pchar.director and acc.api_keytype == API_KEYTYPE_FULL: if pchar.director and acc.api_keytype == API_KEYTYPE_FULL: