aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/open.py
diff options
context:
space:
mode:
authorChris Moylan <chris@chrismoylan.com>2011-07-13 21:58:25 -0500
committerChris Moylan <chris@chrismoylan.com>2011-07-13 21:58:25 -0500
commit9247769a1457ff8ccc8b262f3bdcd7bd36694b16 (patch)
treeda5fa8800135a1e0cd837d8a722d0da1a792fd6d /mediagoblin/db/open.py
parent3d073d48cbf797c3da7b19670b8696d2229cce9b (diff)
parent6ae8b541f957b49ae86051814097e769d20f29af (diff)
downloadmediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.tar.lz
mediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.tar.xz
mediagoblin-9247769a1457ff8ccc8b262f3bdcd7bd36694b16.zip
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/db/open.py')
-rw-r--r--mediagoblin/db/open.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index cae33394..b6987677 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -30,7 +30,7 @@ def connect_database_from_config(app_config):
def setup_connection_and_db_from_config(app_config):
connection = connect_database_from_config(app_config)
- database_path = app_config.get('db_name', 'mediagoblin')
+ database_path = app_config['db_name']
db = connection[database_path]
models.register_models(connection)
# Could configure indexes here on db