Move config.py to init/

Some simple changes needed to do that.

The interesting question left:
Should config_spec.ini also be moved?

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 2450831a3283f90d7cea787b9f0ab8d41e68ba92..9454b40348f802e632a4ca25d44b79f96749c249 100644 (file)
--- 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 d9222620453a286d6228a372c58d835210cedb6b..b80cab493265cf3c12eb31593bee2d8e194aff6d 100644 (file)
--- 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 244f05e5d4f32b3116b7257987135ed207a88b00..f9f12072f22967ffcc39abf974d9cd93c2f9b9fd 100644 (file)
--- 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 966515d26eb1c5243e869a811b2f6dc86dc8035d..e56af4dee4d990b11ec71f774f0743caed410c32 100644 (file)
--- 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