Moving workbench out of process_media

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index da2b7d359f713ae05589d14354f966a50bb949ca..5d5940394d0b24fc87c5381029892bae15119db9 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -25,8 +25,7 @@ from mediagoblin import routing, util, storage, staticdirect
 from mediagoblin.db.open import setup_connection_and_db_from_config
 from mediagoblin.globals import setup_globals
 from mediagoblin.celery_setup import setup_celery_from_config
-from mediagoblin.process_media.workbench import (
-    WorkbenchManager, DEFAULT_WORKBENCH_DIR)
+from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
 
 
 class Error(Exception): pass

diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py
index e1216815b86ccce027b54357d407bdc815f4ea86..5fa9ba7668689cf7a7823b5c92075fce3612178c 100644 (file)
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/celery_setup/from_celery.py
@@ -23,8 +23,7 @@ from mediagoblin import storage
 from mediagoblin.db.open import setup_connection_and_db_from_config
 from mediagoblin.celery_setup import setup_celery_from_config
 from mediagoblin.globals import setup_globals
-from mediagoblin.process_media.workbench import (
-    WorkbenchManager, DEFAULT_WORKBENCH_DIR)
+from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
 
 
 OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery'

diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index fd71a6eb6c5ac246a246a6ff8bda46bd898b99bd..f08a26a058e83836eca0c7bc859efa5ce6b219fe 100644 (file)
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -19,7 +19,7 @@ import tempfile
 
 from nose.tools import assert_raises
 
-from mediagoblin.process_media import workbench
+from mediagoblin import workbench
 from mediagoblin.tests.test_storage import get_tmp_filestorage
 
 

diff --git a/mediagoblin/process_media/workbench.py b/mediagoblin/workbench.py
similarity index 100%
rename from mediagoblin/process_media/workbench.py
rename to mediagoblin/workbench.py