MONGO-CR -> MONGODB-CR (spec change)

Author: behackett

pymongo/auth.py

@@ -31,7 +31,7 @@
 from pymongo.errors import OperationFailure
 
 
-MECHANISMS = ('MONGO-CR', 'GSSAPI')
+MECHANISMS = ('MONGODB-CR', 'GSSAPI')
 """The authentication mechanisms supported by PyMongo."""
 
 
@@ -142,7 +142,7 @@ def _authenticate_gssapi(username, sock_info, cmd_func):
 
 
 def _authenticate_mongo_cr(username, password, source, sock_info, cmd_func):
-    """Authenticate using MONGO-CR.
+    """Authenticate using MONGODB-CR.
     """
     # Get a nonce
     response, _ = cmd_func(sock_info, source, {'getnonce': 1})

pymongo/database.py

@@ -650,7 +650,7 @@ def remove_user(self, name):
         self.system.users.remove({"user": name}, **self._get_wc_override())
 
     def authenticate(self, name, password=None,
-                     source=None, mechanism='MONGO-CR'):
+                     source=None, mechanism='MONGODB-CR'):
         """Authenticate to use this database.
 
         Raises :class:`TypeError` if either `name` or `password` is not
@@ -688,7 +688,7 @@ def authenticate(self, name, password=None,
             specified the current database is used.
           - `mechanism` (optional): See
             :data:`~pymongo.auth.MECHANISMS` for options.
-            Defaults to MONGO-CR (Mongo Challenge Response protocol)
+            Defaults to MONGODB-CR (MongoDB Challenge Response protocol)
 
         .. mongodoc:: authenticate
         """

pymongo/mongo_client.py

@@ -274,7 +274,7 @@ def __init__(self, host=None, port=None, max_pool_size=10,
                           "ignored. If you wish to authenticate to %s, you "
                           "must provide a username and password." % (db_name,))
         if username:
-            mechanism = options.get('authmechanism', 'MONGO-CR')
+            mechanism = options.get('authmechanism', 'MONGODB-CR')
             if mechanism == 'GSSAPI':
                 source = '$external'
             else:

pymongo/mongo_replica_set_client.py

@@ -464,7 +464,7 @@ def __init__(self, hosts_or_uri=None, max_pool_size=10,
                           "ignored. If you wish to authenticate to %s, you "
                           "must provide a username and password." % (db_name,))
         if username:
-            mechanism = options.get('authmechanism', 'MONGO-CR')
+            mechanism = options.get('authmechanism', 'MONGODB-CR')
             if mechanism == 'GSSAPI':
                 source = '$external'
             else:

test/test_uri_parser.py

@@ -128,8 +128,8 @@ def test_split_options(self):
         self.assertEqual({'fsync': False}, split_options('fsync=false'))
         self.assertEqual({'authmechanism': 'GSSAPI'},
                          split_options('authMechanism=GSSAPI'))
-        self.assertEqual({'authmechanism': 'MONGO-CR'},
-                         split_options('authMechanism=MONGO-CR'))
+        self.assertEqual({'authmechanism': 'MONGODB-CR'},
+                         split_options('authMechanism=MONGODB-CR'))
         self.assertEqual({'authsource': 'foobar'}, split_options('authSource=foobar'))
         # maxPoolSize isn't yet a documented URI option.
         self.assertRaises(ConfigurationError, split_options, 'maxpoolsize=50')
@@ -285,29 +285,29 @@ def test_parse_uri(self):
 
         # Various authentication tests
         res = copy.deepcopy(orig)
-        res['options'] = {'authmechanism': 'MONGO-CR'}
+        res['options'] = {'authmechanism': 'MONGODB-CR'}
         res['username'] = 'user'
         res['password'] = 'password'
         self.assertEqual(res,
                          parse_uri("mongodb://user:password@localhost/"
-                                   "?authMechanism=MONGO-CR"))
+                                   "?authMechanism=MONGODB-CR"))
 
         res = copy.deepcopy(orig)
-        res['options'] = {'authmechanism': 'MONGO-CR', 'authsource': 'bar'}
+        res['options'] = {'authmechanism': 'MONGODB-CR', 'authsource': 'bar'}
         res['username'] = 'user'
         res['password'] = 'password'
         res['database'] = 'foo'
         self.assertEqual(res,
                          parse_uri("mongodb://user:password@localhost/foo"
-                                   "?authSource=bar;authMechanism=MONGO-CR"))
+                                   "?authSource=bar;authMechanism=MONGODB-CR"))
 
         res = copy.deepcopy(orig)
-        res['options'] = {'authmechanism': 'MONGO-CR'}
+        res['options'] = {'authmechanism': 'MONGODB-CR'}
         res['username'] = 'user'
         res['password'] = ''
         self.assertEqual(res,
                          parse_uri("mongodb://user:@localhost/"
-                                   "?authMechanism=MONGO-CR"))
+                                   "?authMechanism=MONGODB-CR"))
 
         res = copy.deepcopy(orig)
         res['username'] = '[email protected]'