From 421129b6bbf460057831914c25ab5694f5d21d4f Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 2 Jul 2011 22:40:19 +0200 Subject: [PATCH] Move config.py to init/ Some simple changes needed to do that. The interesting question left: Should config_spec.ini also be moved? --- mediagoblin/app.py | 2 +- mediagoblin/{ => init}/config.py | 0 mediagoblin/tests/test_celery_setup.py | 2 +- mediagoblin/tests/test_config.py | 2 +- mediagoblin/tests/tools.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename mediagoblin/{ => init}/config.py (100%) diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 2450831a..9454b403 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -21,7 +21,7 @@ import routes from webob import Request, exc from mediagoblin import routing, util, storage, staticdirect -from mediagoblin.config import ( +from mediagoblin.init.config import ( read_mediagoblin_config, generate_validation_report) from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.mg_globals import setup_globals diff --git a/mediagoblin/config.py b/mediagoblin/init/config.py similarity index 100% rename from mediagoblin/config.py rename to mediagoblin/init/config.py diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py index d9222620..b80cab49 100644 --- a/mediagoblin/tests/test_celery_setup.py +++ b/mediagoblin/tests/test_celery_setup.py @@ -17,7 +17,7 @@ import pkg_resources from mediagoblin.init import celery as celery_setup -from mediagoblin.config import read_mediagoblin_config +from mediagoblin.init.config import read_mediagoblin_config TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename( diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py index 244f05e5..f9f12072 100644 --- a/mediagoblin/tests/test_config.py +++ b/mediagoblin/tests/test_config.py @@ -16,7 +16,7 @@ import pkg_resources -from mediagoblin import config +from mediagoblin.init import config CARROT_CONF_GOOD = pkg_resources.resource_filename( 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 -- 2.25.1