From d0c7d4eaedda3c8753c98d9259ac2a6e38cca6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 4 Oct 2016 20:43:18 +0200 Subject: [PATCH] add _task to task names for clarity --- src/c3nav/editor/hosters/base.py | 10 +++++----- src/c3nav/editor/tasks.py | 6 +++--- src/c3nav/editor/views.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/c3nav/editor/hosters/base.py b/src/c3nav/editor/hosters/base.py index aafe5e14..332decb0 100644 --- a/src/c3nav/editor/hosters/base.py +++ b/src/c3nav/editor/hosters/base.py @@ -5,7 +5,7 @@ from django.conf import settings from django.urls.base import reverse from django.utils.translation import ugettext_lazy as _ -from c3nav.editor.tasks import check_access_token, request_access_token, submit_edit +from c3nav.editor.tasks import check_access_token_task, request_access_token_task, submit_edit_task from c3nav.mapdata.models import Package @@ -68,7 +68,7 @@ class Hoster(ABC): state = session_data.setdefault('state', 'logged_out') if state == 'checking': - task = request_access_token.AsyncResult(task_id=session_data.get('checking_progress_id')) + task = request_access_token_task.AsyncResult(task_id=session_data.get('checking_progress_id')) self._handle_checking_task(request, task, session_data) state = session_data['state'] @@ -86,7 +86,7 @@ class Hoster(ABC): if state == 'logged_in': session_data['state'] = 'checking' - task = check_access_token.delay(hoster=self.name, access_token=session_data['access_token']) + task = check_access_token_task.delay(hoster=self.name, access_token=session_data['access_token']) session_data['checking_progress_id'] = task.id self._handle_checking_task(request, task, session_data) @@ -110,13 +110,13 @@ class Hoster(ABC): args = (self.name, )+args session_data = self._get_session_data(request) session_data['state'] = 'checking' - task = request_access_token.apply_async(args=args, kwargs=kwargs) + task = request_access_token_task.apply_async(args=args, kwargs=kwargs) session_data['checking_progress_id'] = task.id self._handle_checking_task(request, task, session_data) def submit_edit(self, request, data): session_data = self._get_session_data(request) - task = submit_edit.apply_async(access_token=session_data['access_token'], data=data) + task = submit_edit_task.apply_async(access_token=session_data['access_token'], data=data) return task @abstractmethod diff --git a/src/c3nav/editor/tasks.py b/src/c3nav/editor/tasks.py index 278f6da4..dd9b2a86 100644 --- a/src/c3nav/editor/tasks.py +++ b/src/c3nav/editor/tasks.py @@ -2,18 +2,18 @@ from c3nav.celery import app @app.task() -def request_access_token(hoster, *args, **kwargs): +def request_access_token_task(hoster, *args, **kwargs): from c3nav.editor.hosters import hosters return hosters[hoster].do_request_access_token(*args, **kwargs) @app.task() -def check_access_token(hoster, access_token): +def check_access_token_task(hoster, access_token): from c3nav.editor.hosters import hosters return hosters[hoster].do_check_access_token(access_token) @app.task() -def submit_edit(hoster, access_token, data): +def submit_edit_task(hoster, access_token, data): from c3nav.editor.hosters import hosters return hosters[hoster].do_submit_edit(access_token, data) diff --git a/src/c3nav/editor/views.py b/src/c3nav/editor/views.py index 9dd7c584..3119210a 100644 --- a/src/c3nav/editor/views.py +++ b/src/c3nav/editor/views.py @@ -10,7 +10,7 @@ from django.views.decorators.http import require_POST from c3nav.editor.forms import CommitForm, FeatureForm from c3nav.editor.hosters import get_hoster_for_package, hosters -from c3nav.editor.tasks import submit_edit +from c3nav.editor.tasks import submit_edit_task from c3nav.mapdata.models.feature import FEATURE_TYPES, Feature from c3nav.mapdata.models.package import Package from c3nav.mapdata.packageio.write import json_encode @@ -139,7 +139,7 @@ def finalize(request): elif action == 'result': if 'task' not in request.POST: raise SuspiciousOperation('Missing task id.') - task = submit_edit.AsyncResult(task_id=request.POST['task']) + task = submit_edit_task.AsyncResult(task_id=request.POST['task']) try: task.ready() except: