Move models into new db/ directory

The database is a central point of interest/discussion.
Represent that by its own directory.

This will surely become more interesting when we have
migrations for example.

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index d124558d5e368ce3141af5e3497ff761e2d6065d..908bb19cee0e7fa3b952d7b2b043c3a3108e6e41 100644 (file)
--- 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 55e638b982934af2afdab7700b16212af2e8e4ef..65dcca4060c0e1b44dc4e12a551450359d4ade2b 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/mediagoblin/models.py b/mediagoblin/db/models.py
similarity index 100%
rename from mediagoblin/models.py
rename to mediagoblin/db/models.py

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 602f10982c254b8b01fd3903f5150d7e52a12753..60d349081bfd6d7b5122e146f28185c4e629e420 100644 (file)
--- 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):