Update URI warning in MongoReplicaSetClient.

mongodb · Nov 27, 2012 · c5c7bdf · c5c7bdf
1 parent 76b8b40
commit c5c7bdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pymongo/mongo_client.py b/pymongo/mongo_client.py
@@ -274,8 +274,9 @@ def __init__(self, host=None, port=None, max_pool_size=10,
                 raise ConnectionFailure(str(e))
 
         if db and username is None:
-            warnings.warn("database name in URI is being ignored. if you wish to authenticate to %s, "
+            warnings.warn("database name in URI is being ignored. If you wish "
-                          "you must provide a username and password" % (db,))
+                          "to authenticate to %s, you must provide a username "
+                          "and password." % (db,))
         if username:
             db = db or "admin"
             if not self[db].authenticate(username, password):

diff --git a/pymongo/mongo_replica_set_client.py b/pymongo/mongo_replica_set_client.py
@@ -433,8 +433,9 @@ def __init__(self, hosts_or_uri=None, max_pool_size=10,
             raise ConnectionFailure(str(e))
 
         if db_name and username is None:
-            warnings.warn("must provide a username and password "
+            warnings.warn("database name in URI is being ignored. If you wish "
-                          "to authenticate to %s" % (db_name,))
+                          "to authenticate to %s, you must provide a username "
+                          "and password." % (db_name,))
         if username:
             db_name = db_name or 'admin'
             if not self[db_name].authenticate(username, password):