aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-05-18 00:44:10 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-05-18 00:44:10 +0200
commit0f18ed8f5e179326721221df93734864074bc185 (patch)
treec6d2c610fdb5166c89eee74ad2224d1bf36c5c58 /mediagoblin
parent931f318cbc571419510b1ad37298c981df2f16b0 (diff)
downloadmediagoblin-0f18ed8f5e179326721221df93734864074bc185.tar.lz
mediagoblin-0f18ed8f5e179326721221df93734864074bc185.tar.xz
mediagoblin-0f18ed8f5e179326721221df93734864074bc185.zip
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.
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/app.py3
-rw-r--r--mediagoblin/celery_setup/from_celery.py3
-rw-r--r--mediagoblin/db/__init__.py0
-rw-r--r--mediagoblin/db/models.py (renamed from mediagoblin/models.py)0
-rw-r--r--mediagoblin/views.py2
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):