From 073b61fe53d4e499d7034bb8de2404cd87dc9095 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 19 Jun 2011 23:09:35 +0200 Subject: Move mediagoblin.celery_setup -> mediagoblin.init.celery As the first target of the new .init. submodule move celery_setup there. Quite straight forward, just a lot of places to change. --- mediagoblin/tests/tools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mediagoblin/tests/tools.py') diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 64f773f0..966515d2 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -42,8 +42,8 @@ USER_DEV_DIRECTORIES_TO_SETUP = [ BAD_CELERY_MESSAGE = """\ Sorry, you *absolutely* must run nosetests with the -mediagoblin.celery_setup.from_tests module. Like so: -$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests""" +mediagoblin.init.celery.from_tests module. Like so: +$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/nosetests""" class BadCeleryEnviron(Exception): pass @@ -51,7 +51,7 @@ class BadCeleryEnviron(Exception): pass def suicide_if_bad_celery_environ(): if not os.environ.get('CELERY_CONFIG_MODULE') == \ - 'mediagoblin.celery_setup.from_tests': + 'mediagoblin.init.celery.from_tests': raise BadCeleryEnviron(BAD_CELERY_MESSAGE) @@ -59,7 +59,7 @@ def get_test_app(dump_old_app=True): suicide_if_bad_celery_environ() # Leave this imported as it sets up celery. - from mediagoblin.celery_setup import from_tests + from mediagoblin.init.celery import from_tests global MGOBLIN_APP -- cgit v1.2.3 From 421129b6bbf460057831914c25ab5694f5d21d4f Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 2 Jul 2011 22:40:19 +0200 Subject: Move config.py to init/ Some simple changes needed to do that. The interesting question left: Should config_spec.ini also be moved? --- mediagoblin/tests/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/tests/tools.py') diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 966515d2..e56af4de 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -22,7 +22,7 @@ from paste.deploy import loadapp from webtest import TestApp from mediagoblin import util -from mediagoblin.config import read_mediagoblin_config +from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.decorators import _make_safe from mediagoblin.db.open import setup_connection_and_db_from_config -- cgit v1.2.3