aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init/celery/__init__.py
diff options
context:
space:
mode:
authorBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
committerBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
commitc16b8196631e5b1c4cbe618a9af74f5455fe861c (patch)
tree5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/init/celery/__init__.py
parent28f364bd6d488955952aebe86033e5ba148da2fb (diff)
parent7ccf41818581743c2e16935cd7308ad3d6694149 (diff)
downloadmediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to processing/__init__.py, and putting the comment deletion tests back into test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/init/celery/__init__.py')
-rw-r--r--mediagoblin/init/celery/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index 29ccd83a..67b020c3 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -18,7 +18,7 @@ import os
import sys
-MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing']
+MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task']
DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module'