Moving workbench out of process_media
This commit is contained in:
parent
d40f55e3d9
commit
a32acafa0b
@ -25,8 +25,7 @@ from mediagoblin import routing, util, storage, staticdirect
|
|||||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||||
from mediagoblin.globals import setup_globals
|
from mediagoblin.globals import setup_globals
|
||||||
from mediagoblin.celery_setup import setup_celery_from_config
|
from mediagoblin.celery_setup import setup_celery_from_config
|
||||||
from mediagoblin.process_media.workbench import (
|
from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
|
||||||
WorkbenchManager, DEFAULT_WORKBENCH_DIR)
|
|
||||||
|
|
||||||
|
|
||||||
class Error(Exception): pass
|
class Error(Exception): pass
|
||||||
|
@ -23,8 +23,7 @@ from mediagoblin import storage
|
|||||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||||
from mediagoblin.celery_setup import setup_celery_from_config
|
from mediagoblin.celery_setup import setup_celery_from_config
|
||||||
from mediagoblin.globals import setup_globals
|
from mediagoblin.globals import setup_globals
|
||||||
from mediagoblin.process_media.workbench import (
|
from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
|
||||||
WorkbenchManager, DEFAULT_WORKBENCH_DIR)
|
|
||||||
|
|
||||||
|
|
||||||
OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery'
|
OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery'
|
||||||
|
@ -19,7 +19,7 @@ import tempfile
|
|||||||
|
|
||||||
from nose.tools import assert_raises
|
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
|
from mediagoblin.tests.test_storage import get_tmp_filestorage
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user