PYTHON-1321 Remove MongoReplicaSetClient (mongodb#552)

Author: ShaneHarvey

doc/api/pymongo/index.rst

@@ -9,10 +9,6 @@
 
  Alias for :class:`pymongo.mongo_client.MongoClient`.
 
- .. data:: MongoReplicaSetClient
-
- Alias for :class:`pymongo.mongo_replica_set_client.MongoReplicaSetClient`.
-
  .. data:: ReadPreference
 
  Alias for :class:`pymongo.read_preferences.ReadPreference`.
@@ -46,7 +42,6 @@ Sub-modules:
  errors
  message
  mongo_client
- mongo_replica_set_client
  monitoring
  operations
  pool

doc/api/pymongo/mongo_replica_set_client.rst

@@ -25,6 +25,7 @@ Breaking Changes in 4.0
 - Removed :meth:`pymongo.database.Database.collection_names`.
 - Removed :meth:`pymongo.collection.Collection.parallel_scan`.
 - Removed :mod:`pymongo.thread_util`.
+- Removed :class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient`.
 
 Notable improvements
 ....................

doc/changelog.rst

@@ -50,6 +50,15 @@ Warnings can also be changed to errors::
 .. note:: Not all deprecated features raise :exc:`DeprecationWarning` when
  used. See `Removed features with no migration path`_.
 
+MongoReplicaSetClient
+---------------------
+
+Removed :class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient`.
+Since PyMongo 3.0, ``MongoReplicaSetClient`` has been identical to
+:class:`pymongo.mongo_client.MongoClient`. Applications can simply replace
+``MongoReplicaSetClient`` with :class:`pymongo.mongo_client.MongoClient` and
+get the same behavior.
+
 MongoClient
 -----------
 

doc/migrate-to-pymongo4.rst

@@ -89,7 +89,6 @@ def get_version_string():
  MAX_SUPPORTED_WIRE_VERSION)
 from pymongo.cursor import CursorType
 from pymongo.mongo_client import MongoClient
-from pymongo.mongo_replica_set_client import MongoReplicaSetClient
 from pymongo.operations import (IndexModel,
  InsertOne,
  DeleteOne,

pymongo/__init__.py

@@ -364,7 +364,7 @@ def validate_read_preference(dummy, value):
 
 
 def validate_read_preference_mode(dummy, value):
- """Validate read preference mode for a MongoReplicaSetClient.
+ """Validate read preference mode for a MongoClient.
 
  .. versionchanged:: 3.5
  Returns the original ``value`` instead of the validated read preference

pymongo/common.py

@@ -1001,8 +1001,7 @@ def primary(self):
  `replicaSet` option.
 
  .. versionadded:: 3.0
- MongoClient gained this property in version 3.0 when
- MongoReplicaSetClient's functionality was merged in.
+ MongoClient gained this property in version 3.0.
  """
  return self._topology.get_primary()
 
@@ -1015,8 +1014,7 @@ def secondaries(self):
  client was created without the `replicaSet` option.
 
  .. versionadded:: 3.0
- MongoClient gained this property in version 3.0 when
- MongoReplicaSetClient's functionality was merged in.
+ MongoClient gained this property in version 3.0.
  """
  return self._topology.get_secondaries()
 

pymongo/mongo_client.py

@@ -38,7 +38,7 @@
 
 
 def _validate_tag_sets(tag_sets):
- """Validate tag sets for a MongoReplicaSetClient.
+ """Validate tag sets for a MongoClient.
  """
  if tag_sets is None:
  return tag_sets
@@ -144,7 +144,7 @@ def tag_sets(self):
  To specify a priority-order for tag sets, provide a list of
  tag sets: ``[{'dc': 'ny'}, {'dc': 'la'}, {}]``. A final, empty tag
  set, ``{}``, means "read from any member that matches the mode,
- ignoring tags." MongoReplicaSetClient tries each set of tags in turn
+ ignoring tags." MongoClient tries each set of tags in turn
  until it finds a set of tags with at least one matching member.
 
  .. seealso:: `Data-Center Awareness

pymongo/mongo_replica_set_client.py

@@ -28,11 +28,10 @@
 from bson.py3compat import StringIO, string_type
 from pymongo.mongo_client import MongoClient
 from pymongo.errors import (ConfigurationError,
- ConnectionFailure,
+ NotMasterError,
  ServerSelectionTimeoutError)
 from pymongo.read_preferences import ReadPreference
 from gridfs.errors import CorruptGridFile, FileExists, NoFile
-from test.test_replica_set_client import TestReplicaSetClientBase
 from test import (client_context,
  unittest,
  IntegrationTest)
@@ -487,7 +486,7 @@ def test_md5(self):
  self.assertIsNone(gout.md5)
 
 
-class TestGridfsReplicaSet(TestReplicaSetClientBase):
+class TestGridfsReplicaSet(IntegrationTest):
 
  @classmethod
  @client_context.require_secondaries_count(1)
@@ -500,7 +499,7 @@ def tearDownClass(cls):
 
  def test_gridfs_replica_set(self):
  rsc = rs_client(
- w=self.w,
+ w=client_context.w,
  read_preference=ReadPreference.SECONDARY)
 
  fs = gridfs.GridFS(rsc.gfsreplica, 'gfsreplicatest')
@@ -513,10 +512,7 @@ def test_gridfs_replica_set(self):
  self.assertEqual(b'foo', content)
 
  def test_gridfs_secondary(self):
- primary_host, primary_port = self.primary
- primary_connection = single_client(primary_host, primary_port)
-
- secondary_host, secondary_port = one(self.secondaries)
+ secondary_host, secondary_port = one(self.client.secondaries)
  secondary_connection = single_client(
  secondary_host, secondary_port,
  read_preference=ReadPreference.SECONDARY)
@@ -526,12 +522,12 @@ def test_gridfs_secondary(self):
  fs = gridfs.GridFS(secondary_connection.gfsreplica, 'gfssecondarytest')
 
  # This won't detect secondary, raises error
- self.assertRaises(ConnectionFailure, fs.put, b'foo')
+ self.assertRaises(NotMasterError, fs.put, b'foo')
 
  def test_gridfs_secondary_lazy(self):
  # Should detect it's connected to secondary and not attempt to
  # create index.
- secondary_host, secondary_port = one(self.secondaries)
+ secondary_host, secondary_port = one(self.client.secondaries)
  client = single_client(
  secondary_host,
  secondary_port,
@@ -543,7 +539,7 @@ def test_gridfs_secondary_lazy(self):
 
  # Connects, doesn't create index.
  self.assertRaises(NoFile, fs.get_last_version)
- self.assertRaises(ConnectionFailure, fs.put, 'data')
+ self.assertRaises(NotMasterError, fs.put, 'data')
 
 
 if __name__ == "__main__":