aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing/task.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-11 15:22:43 -0500
committerRodney Ewing <ewing.rj@gmail.com>2013-08-16 15:30:16 -0700
commit55cfa3406390732173195bb920bf3f86bd1ce9f4 (patch)
tree7837cb056a57fe927c2c98ad0528948ad288c6af /mediagoblin/processing/task.py
parenta59f92f3eca79b8070c2142a2be0ee5a48fe4611 (diff)
downloadmediagoblin-55cfa3406390732173195bb920bf3f86bd1ce9f4.tar.lz
mediagoblin-55cfa3406390732173195bb920bf3f86bd1ce9f4.tar.xz
mediagoblin-55cfa3406390732173195bb920bf3f86bd1ce9f4.zip
Renaming the processing manager stuff to be less ambiguous.
BONUS COMMIT to Ben Finney and the Free Software Melbourne crew. :) IRONY: Initially I committed this as "media manager".
Diffstat (limited to 'mediagoblin/processing/task.py')
-rw-r--r--mediagoblin/processing/task.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 240be4e5..397514d0 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -23,7 +23,7 @@ from celery import registry, task
from mediagoblin import mg_globals as mgg
from . import mark_entry_failed, BaseProcessingFail
from mediagoblin.tools.processing import json_processing_callback
-from mediagoblin.processing import get_entry_and_manager
+from mediagoblin.processing import get_entry_and_processing_manager
_log = logging.getLogger(__name__)
logging.basicConfig()
@@ -79,7 +79,7 @@ class ProcessMedia(task.Task):
info for the media_type.
"""
reprocess_info = reprocess_info or {}
- entry, manager = get_entry_and_manager(media_id)
+ entry, manager = get_entry_and_processing_manager(media_id)
# Try to process, and handle expected errors.
try: