diff options
| -rw-r--r-- | mediagoblin/app.py | 3 | ||||
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 3 | ||||
| -rw-r--r-- | mediagoblin/tests/test_workbench.py | 2 | ||||
| -rw-r--r-- | mediagoblin/workbench.py (renamed from mediagoblin/process_media/workbench.py) | 0 |
4 files changed, 3 insertions, 5 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index da2b7d35..5d594039 100644 --- 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 e1216815..5fa9ba76 100644 --- 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 fd71a6eb..f08a26a0 100644 --- 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 index b1198adf..b1198adf 100644 --- a/mediagoblin/process_media/workbench.py +++ b/mediagoblin/workbench.py |