From 19da1324df5a6def9dd61b05824577e57b928fd5 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Tue, 11 Jun 2013 16:13:31 +0200
Subject: [PATCH] _mdb_get_database: Restore 'uri is db name' functionality.

Forgot to run the test suite after the last round of changes :(.
On the good side, this commit should actually restore backwards
compatibility with previous MongoDB support.
---
 src/saml2/mongo_store.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/saml2/mongo_store.py b/src/saml2/mongo_store.py
index 607678e..4d7e204 100644
--- a/src/saml2/mongo_store.py
+++ b/src/saml2/mongo_store.py
@@ -266,25 +266,28 @@ def _mdb_get_database(uri, **kwargs):
     :params database: name as string or (uri, name)
     :returns: pymongo database object
     """
+    if not "tz_aware" in kwargs:
+        # default, but not forced
+        kwargs["tz_aware"] = True
+
     connection_factory = MongoClient
     _parsed_uri = {}
     db_name = None
+    _conn = None
+
     try:
         _parsed_uri = pymongo.uri_parser.parse_uri(uri)
     except pymongo.errors.InvalidURI:
         # assume URI to be just the database name
         db_name = uri
+        _conn = MongoClient()
         pass
     else:
         if "replicaset" in _parsed_uri["options"]:
             connection_factory = MongoReplicaSetClient
         db_name = _parsed_uri.get("database", "pysaml2")
+        _conn = connection_factory(uri, **kwargs)
 
-    if not "tz_aware" in kwargs:
-        # default, but not forced
-        kwargs["tz_aware"] = True
-
-    _conn = connection_factory(uri, **kwargs)
     _db = _conn[db_name]
 
     if "username" in _parsed_uri: