diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-18 09:34:09 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-18 09:34:09 -0600 |
| commit | 817066506d846d06d0489dfb42b8200b86f61153 (patch) | |
| tree | 36578ed7e5b2b205c919fcfb8929c8fc33a79c3f /mediagoblin/db/open.py | |
| parent | 76c6c806caec7af20a3fe11c04bb783baacc3934 (diff) | |
| parent | 3618a9ac5112c657fd095a0f9cbd346921a4e800 (diff) | |
| download | mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.lz mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.xz mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/db/open.py')
| -rw-r--r-- | mediagoblin/db/open.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py index e73b6258..e677ba12 100644 --- a/mediagoblin/db/open.py +++ b/mediagoblin/db/open.py @@ -29,7 +29,7 @@ def connect_database_from_config(app_config, use_pymongo=False): port = app_config.get('db_port') if port: port = asint(port) - + if use_pymongo: connection = pymongo.Connection( app_config.get('db_host'), port) |