Moving workbench out of process_media

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

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'

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