PYTHON-1145 RS client obeys "uuidRepresentation=".

ajdavis · ajdavis · commit c7c352ff3d93 · 2016-09-19T17:19:06.000-04:00
diff --git a/pymongo/mongo_replica_set_client.py b/pymongo/mongo_replica_set_client.py
@@ -653,7 +653,9 @@ def __init__(self, hosts_or_uri=None, max_pool_size=100,
                 'max_pool_size', max_pool_size))
 
         common.validate_boolean('tz_aware', tz_aware)
-        uuid_representation = options.pop('uuidrepresentation', PYTHON_LEGACY)
+        uuid_representation = self.__opts.pop('uuidrepresentation',
+                                              PYTHON_LEGACY)
+
         self.__opts['codec_options'] = CodecOptions(
             document_class, tz_aware, uuid_representation)
 
diff --git a/test/test_client.py b/test/test_client.py
@@ -1125,6 +1125,12 @@ def test_kill_cursors_warning(self):
         collection.find_one()
         cursor.close()
 
+    def test_uuid_representation_kwarg(self):
+        client = MongoClient(uuidRepresentation='javaLegacy',
+                             connect=False)
+
+        self.assertEqual(client.uuid_subtype, JAVA_LEGACY)
+
 
 class TestClientLazyConnect(unittest.TestCase, _TestLazyConnectMixin):
     def _get_client(self, **kwargs):
diff --git a/test/test_replica_set_client.py b/test/test_replica_set_client.py
@@ -33,6 +33,7 @@
 
 from nose.plugins.skip import SkipTest
 
+from bson import JAVA_LEGACY
 from bson.son import SON
 from bson.tz_util import utc
 from pymongo.mongo_client import MongoClient
@@ -1268,6 +1269,13 @@ def test_alive(self):
         finally:
             ctx.exit()
 
+    def test_uuid_representation_kwarg(self):
+        client = MongoReplicaSetClient(uuidRepresentation='javaLegacy',
+                                       replicaSet='rs',
+                                       connect=False)
+
+        self.assertEqual(client.uuid_subtype, JAVA_LEGACY)
+
 
 class TestReplicaSetWireVersion(unittest.TestCase):
     def test_wire_version(self):
