diff options
| -rw-r--r-- | mediagoblin/app.py | 3 | ||||
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 3 | ||||
| -rw-r--r-- | mediagoblin/db/__init__.py | 0 | ||||
| -rw-r--r-- | mediagoblin/db/models.py (renamed from mediagoblin/models.py) | 0 | ||||
| -rw-r--r-- | mediagoblin/views.py | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index d124558d..908bb19c 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -21,7 +21,8 @@ import mongokit from paste.deploy.converters import asbool, asint from webob import Request, exc -from mediagoblin import routing, util, models, storage, staticdirect +from mediagoblin import routing, util, storage, staticdirect +from mediagoblin.db import models from mediagoblin.globals import setup_globals from mediagoblin.celery_setup import setup_celery_from_config diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 55e638b9..65dcca40 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -20,7 +20,8 @@ import mongokit from paste.deploy.loadwsgi import NicerConfigParser from paste.deploy.converters import asint, asbool -from mediagoblin import storage, models +from mediagoblin import storage +from mediagoblin.db import models from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.globals import setup_globals from mediagoblin import globals as mgoblin_globals diff --git a/mediagoblin/db/__init__.py b/mediagoblin/db/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/mediagoblin/db/__init__.py diff --git a/mediagoblin/models.py b/mediagoblin/db/models.py index 1bc1da60..1bc1da60 100644 --- a/mediagoblin/models.py +++ b/mediagoblin/db/models.py diff --git a/mediagoblin/views.py b/mediagoblin/views.py index 602f1098..60d34908 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -20,7 +20,7 @@ from webob import Response, exc import wtforms from pymongo import DESCENDING from mongokit import ObjectId -from mediagoblin import models +from mediagoblin.db import models import gettext def root_view(request): |