diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:14:42 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-13 23:14:42 -0500 |
| commit | c47c37ed953689e70441c4c143e4c06f1645be7d (patch) | |
| tree | f63fed482a8e9c8dcd54cf0bd18d747f8516179b /mediagoblin/db/open.py | |
| parent | 59051a23f01eb49ed6fe6975991730021ac169ac (diff) | |
| parent | 6ae8b541f957b49ae86051814097e769d20f29af (diff) | |
| download | mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.tar.lz mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.tar.xz mediagoblin-c47c37ed953689e70441c4c143e4c06f1645be7d.zip | |
Merge branch 'master' into f411_new_migrations
Conflicts:
mediagoblin/db/open.py
Diffstat (limited to 'mediagoblin/db/open.py')
| -rw-r--r-- | mediagoblin/db/open.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py index cb040c29..e5fde6f9 100644 --- a/mediagoblin/db/open.py +++ b/mediagoblin/db/open.py @@ -38,6 +38,7 @@ def connect_database_from_config(app_config, use_pymongo=False): app_config.get('db_host'), port) return connection + def setup_connection_and_db_from_config(app_config, use_pymongo=False): """ Setup connection and database from config. @@ -45,7 +46,7 @@ def setup_connection_and_db_from_config(app_config, use_pymongo=False): Optionally use pymongo instead of mongokit. """ connection = connect_database_from_config(app_config, use_pymongo) - database_path = app_config.get('db_name', 'mediagoblin') + database_path = app_config['db_name'] db = connection[database_path] if not use_pymongo: |