diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
| commit | c16b8196631e5b1c4cbe618a9af74f5455fe861c (patch) | |
| tree | 5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/db/mongo/open.py | |
| parent | 28f364bd6d488955952aebe86033e5ba148da2fb (diff) | |
| parent | 7ccf41818581743c2e16935cd7308ad3d6694149 (diff) | |
| download | mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip | |
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to
processing/__init__.py, and putting the comment deletion tests back into
test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/db/mongo/open.py')
| -rw-r--r-- | mediagoblin/db/mongo/open.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/db/mongo/open.py b/mediagoblin/db/mongo/open.py index bedc497b..c4f37b42 100644 --- a/mediagoblin/db/mongo/open.py +++ b/mediagoblin/db/mongo/open.py @@ -21,6 +21,10 @@ from mediagoblin.db.mongo import models from mediagoblin.db.mongo.util import MigrationManager +def load_models(app_config): + pass + + def connect_database_from_config(app_config, use_pymongo=False): """ Connect to the main database, take config from app_config |