Move config.py to init/
Some simple changes needed to do that. The interesting question left: Should config_spec.ini also be moved?
This commit is contained in:
parent
42ef819cbb
commit
421129b6bb
@ -21,7 +21,7 @@ import routes
|
|||||||
from webob import Request, exc
|
from webob import Request, exc
|
||||||
|
|
||||||
from mediagoblin import routing, util, storage, staticdirect
|
from mediagoblin import routing, util, storage, staticdirect
|
||||||
from mediagoblin.config import (
|
from mediagoblin.init.config import (
|
||||||
read_mediagoblin_config, generate_validation_report)
|
read_mediagoblin_config, generate_validation_report)
|
||||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||||
from mediagoblin.mg_globals import setup_globals
|
from mediagoblin.mg_globals import setup_globals
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
||||||
from mediagoblin.init import celery as celery_setup
|
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(
|
TEST_CELERY_CONF_NOSPECIALDB = pkg_resources.resource_filename(
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
||||||
from mediagoblin import config
|
from mediagoblin.init import config
|
||||||
|
|
||||||
|
|
||||||
CARROT_CONF_GOOD = pkg_resources.resource_filename(
|
CARROT_CONF_GOOD = pkg_resources.resource_filename(
|
||||||
|
@ -22,7 +22,7 @@ from paste.deploy import loadapp
|
|||||||
from webtest import TestApp
|
from webtest import TestApp
|
||||||
|
|
||||||
from mediagoblin import util
|
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.decorators import _make_safe
|
||||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user