Avoid "not master" error from update or remove with lazy-connecting MongoClient, PYTHON-653.

Author: ajdavis

pymongo/collection.py

@@ -511,6 +511,10 @@ def update(self, spec, document, upsert=False, manipulate=False,
  if not isinstance(upsert, bool):
  raise TypeError("upsert must be an instance of bool")
 
+ client = self.database.connection
+ # Need to connect to know the wire version, and may want to connect
+ # before applying SON manipulators.
+ client._ensure_connected(True)
  if manipulate:
  document = self.__database._fix_incoming(document, self)
 
@@ -526,7 +530,6 @@ def update(self, spec, document, upsert=False, manipulate=False,
  if first.startswith('$'):
  check_keys = False
 
- client = self.database.connection
  if client.max_wire_version > 1 and safe:
  # Update command
  command = SON([('update', self.name)])
@@ -642,6 +645,9 @@ def remove(self, spec_or_id=None, safe=None, multi=True, **kwargs):
  safe, options = self._get_write_mode(safe, **kwargs)
 
  client = self.database.connection
+
+ # Need to connect to know the wire version.
+ client._ensure_connected(True)
  if client.max_wire_version > 1 and safe:
  # Delete command
  command = SON([('delete', self.name)])

pymongo/mongo_client.py

@@ -1097,11 +1097,11 @@ def _send_message(self, message,
  - `check_primary`: don't try to write to a non-primary; see
  kill_cursors for an exception to this rule
  """
+ member = self.__ensure_member()
  if check_primary and not with_last_error and not self.is_primary:
  # The write won't succeed, bail as if we'd done a getLastError
  raise AutoReconnect("not master")
 
- member = self.__ensure_member()
  sock_info = self.__socket(member)
  try:
  try:

test/test_client.py

@@ -980,6 +980,16 @@ def test_replica_set(self):
  ConfigurationError,
  MongoClient, host, port, replicaSet='bad' + name)
 
+ def test_lazy_connect_w0(self):
+ client = get_client(_connect=False)
+ client.pymongo_test.test.insert({}, w=0)
+
+ client = get_client(_connect=False)
+ client.pymongo_test.test.update({}, {'$set': {'x': 1}}, w=0)
+
+ client = get_client(_connect=False)
+ client.pymongo_test.test.remove(w=0)
+
 
 class TestClientLazyConnect(unittest.TestCase, _TestLazyConnectMixin):
  def _get_client(self, **kwargs):