heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f411_new_migrations

Browse Source 
Conflicts:
	mediagoblin/db/open.py
This commit is contained in:
Christopher Allan Webber
2011-07-13 23:14:42 -05:00
parent 59051a23f0 6ae8b541f9
commit c47c37ed95
12 changed files with 88 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/db/open.py
View File

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