Incorporate review changes

Author: prashantmital

pymongo/change_stream.py

@@ -302,9 +302,9 @@ def try_next(self):
  self._resume()
  change = self._cursor._try_next(False)
  except OperationFailure as exc:
- is_resumable = ((exc.max_wire_version >= 9 and
+ is_resumable = ((exc._max_wire_version >= 9 and
  exc.has_error_label("ResumableChangeStreamError")) or
- (exc.max_wire_version < 9 and
+ (exc._max_wire_version < 9 and
  exc.code in _RESUMABLE_GETMORE_ERRORS))
  if not is_resumable:
  raise

pymongo/errors.py

@@ -156,6 +156,10 @@ def __init__(self, error, code=None, details=None, max_wire_version=None):
  self.__details = details
  self.__max_wire_version = max_wire_version
 
+ @property
+ def _max_wire_version(self):
+ return self.__max_wire_version
+
  @property
  def code(self):
  """The error code returned by the server, if any.
@@ -189,6 +193,7 @@ def __str__(self):
  return output_str.encode('utf-8', errors='replace')
  return output_str
 
+
 class CursorNotFound(OperationFailure):
  """Raised while iterating query results if the cursor is
  invalidated on the server.

pymongo/helpers.py

@@ -102,9 +102,9 @@ def _index_document(index_list):
  return index
 
 
-def _check_command_response(response, msg=None, allowable_errors=None,
- parse_write_concern_error=False,
- max_wire_version=None):
+def _check_command_response(response, max_wire_version, msg=None,
+ allowable_errors=None,
+ parse_write_concern_error=False):
  """Check the response to a command for errors.
  """
  if "ok" not in response:
@@ -168,10 +168,10 @@ def _check_command_response(response, msg=None, allowable_errors=None,
  max_wire_version)
 
 
-def _check_gle_response(result):
+def _check_gle_response(result, max_wire_version):
  """Return getlasterror response as a dict, or raise OperationFailure."""
  # Did getlasterror itself fail?
- _check_command_response(result)
+ _check_command_response(result, max_wire_version)
 
  if result.get("wtimeout", False):
  # MongoDB versions before 1.8.0 return the error message in an "errmsg"

pymongo/network.py

@@ -40,7 +40,7 @@
 _UNPACK_HEADER = struct.Struct("<iiii").unpack
 
 
-def command(sock_info, dbname, spec, slave_ok, is_mongos,
+def command(sock_info, max_wire_version, dbname, spec, slave_ok, is_mongos,
  read_preference, codec_options, session, client, check=True,
  allowable_errors=None, address=None,
  check_keys=False, listeners=None, max_bson_size=None,
@@ -157,7 +157,7 @@ def command(sock_info, dbname, spec, slave_ok, is_mongos,
  client._process_response(response_doc, session)
  if check:
  helpers._check_command_response(
- response_doc, None, allowable_errors,
+ response_doc, max_wire_version, None, allowable_errors,
  parse_write_concern_error=parse_write_concern_error)
  except Exception as exc:
  if publish:

pymongo/pool.py

@@ -680,11 +680,11 @@ def command(self, dbname, spec, slave_ok=False,
  if self.op_msg_enabled:
  self._raise_if_not_writable(unacknowledged)
  try:
- return command(self, dbname, spec, slave_ok,
- self.is_mongos, read_preference, codec_options,
- session, client, check, allowable_errors,
- self.address, check_keys, listeners,
- self.max_bson_size, read_concern,
+ return command(self, self.max_wire_version, dbname, spec,
+ slave_ok, self.is_mongos, read_preference,
+ codec_options, session, client, check,
+ allowable_errors, self.address, check_keys,
+ listeners, self.max_bson_size, read_concern,
  parse_write_concern_error=parse_write_concern_error,
  collation=collation,
  compression_ctx=self.compression_context,
@@ -751,7 +751,8 @@ def legacy_write(self, request_id, msg, max_doc_size, with_last_error):
  self.send_message(msg, max_doc_size)
  if with_last_error:
  reply = self.receive_message(request_id)
- return helpers._check_gle_response(reply.command_response())
+ return helpers._check_gle_response(reply.command_response(),
+ self.max_wire_version)
 
  def write_command(self, request_id, msg):
  """Send "insert" etc. command, returning response as a dict.
@@ -767,7 +768,7 @@ def write_command(self, request_id, msg):
  result = reply.command_response()
 
  # Raises NotMasterError or OperationFailure.
- helpers._check_command_response(result)
+ helpers._check_command_response(result, self.max_wire_version)
  return result
 
  def check_auth(self, all_credentials):

pymongo/server.py

@@ -134,7 +134,7 @@ def run_operation_with_response(
  operation.client._process_response(
  first, operation.session)
  _check_command_response(
- first, max_wire_version=sock_info.max_wire_version)
+ first, sock_info.max_wire_version)
  except Exception as exc:
  if publish:
  duration = datetime.now() - start

test/test_change_stream.py

@@ -37,7 +37,6 @@
 from bson.raw_bson import DEFAULT_RAW_BSON_OPTIONS, RawBSONDocument
 
 from pymongo import MongoClient
-# from pymongo.change_stream import _NON_RESUMABLE_GETMORE_ERRORS
 from pymongo.command_cursor import CommandCursor
 from pymongo.errors import (InvalidOperation, OperationFailure,
  ServerSelectionTimeoutError)

test/test_database.py

@@ -954,10 +954,10 @@ def test_command_response_without_ok(self):
  # command document will have no 'ok' field. We should raise
  # OperationFailure instead of KeyError.
  self.assertRaises(OperationFailure,
- helpers._check_command_response, {})
+ helpers._check_command_response, {}, None)
 
  try:
- helpers._check_command_response({'$err': 'foo'})
+ helpers._check_command_response({'$err': 'foo'}, None)
  except OperationFailure as e:
  self.assertEqual(e.args[0], 'foo')
  else:
@@ -970,7 +970,7 @@ def test_mongos_response(self):
  'raw': {'shard0/host0,host1': {'ok': 0, 'errmsg': 'inner'}}}
 
  with self.assertRaises(OperationFailure) as context:
- helpers._check_command_response(error_document)
+ helpers._check_command_response(error_document, None)
 
  self.assertIn('inner', str(context.exception))
 
@@ -983,7 +983,7 @@ def test_mongos_response(self):
  'raw': {'shard0/host0,host1': {}}}
 
  with self.assertRaises(OperationFailure) as context:
- helpers._check_command_response(error_document)
+ helpers._check_command_response(error_document, None)
 
  self.assertIn('outer', str(context.exception))
 
@@ -994,7 +994,7 @@ def test_mongos_response(self):
  'raw': {'shard0/host0,host1': {'ok': 0}}}
 
  with self.assertRaises(OperationFailure) as context:
- helpers._check_command_response(error_document)
+ helpers._check_command_response(error_document, None)
 
  self.assertIn('outer', str(context.exception))
 

test/test_discovery_and_monitoring.py

@@ -110,7 +110,7 @@ def got_app_error(topology, app_error):
  # Pool/SocketInfo.
  try:
  if error_type == 'command':
- _check_command_response(app_error['response'])
+ _check_command_response(app_error['response'], max_wire_version)
  elif error_type == 'network':
  raise AutoReconnect('mock non-timeout network error')
  elif error_type == 'timeout':