aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-25 20:52:25 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-25 20:52:25 +0100
commit71717fd5316607500159f782b10ca91cf9684bfd (patch)
tree2a8503e3fae088564b0934abf10309cf108f3c22 /mediagoblin/processing
parentc338ed34fa30d84660bac4f275f73d8f2f6c902e (diff)
downloadmediagoblin-71717fd5316607500159f782b10ca91cf9684bfd.tar.lz
mediagoblin-71717fd5316607500159f782b10ca91cf9684bfd.tar.xz
mediagoblin-71717fd5316607500159f782b10ca91cf9684bfd.zip
Remove ObjectId from the tree
This was one of the last remaining Mongo holdouts and has been removed from the tree herewith. Good bye, ObjectId. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'mediagoblin/processing')
-rw-r--r--mediagoblin/processing/task.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 06a26bb7..b7e761f2 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -19,7 +19,7 @@ import logging
from celery.task import Task
from mediagoblin import mg_globals as mgg
-from mediagoblin.db.util import ObjectId
+from mediagoblin.db.sql.models import MediaEntry
from mediagoblin.processing import mark_entry_failed, BaseProcessingFail
from mediagoblin.tools.processing import json_processing_callback
@@ -41,8 +41,7 @@ class ProcessMedia(Task):
Pass the media entry off to the appropriate processing function
(for now just process_image...)
"""
- entry = mgg.database.MediaEntry.one(
- {'id': ObjectId(media_id)})
+ entry = MediaEntry.query.get(media_id)
# Try to process, and handle expected errors.
try: