From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Tue, 17 May 2011 22:44:10 +0000 (+0200)
Subject: Move models into new db/ directory
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f18ed8f5e179326721221df93734864074bc185;p=mediagoblin.git

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 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
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 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):