PYTHON-2899 Remove code for MongoDB <= 3.4 (mongodb#729)

Remove unneeded memoryview to bytes conversion.

Author: ShaneHarvey

pymongo/_cmessagemodule.c

@@ -88,11 +88,6 @@ def _database(self):
  """The database against which the aggregation command is run."""
  raise NotImplementedError
 
- @staticmethod
- def _check_compat(sock_info):
- """Check whether the server version in-use supports aggregation."""
- pass
-
  def _process_result(self, result, session, server, sock_info, secondary_ok):
  if self._result_processor:
  self._result_processor(
@@ -104,9 +99,6 @@ def get_read_preference(self, session):
  return self._target._read_preference_for(session)
 
  def get_cursor(self, session, server, sock_info, secondary_ok):
- # Ensure command compatibility.
- self._check_compat(sock_info)
-
  # Serialize command.
  cmd = SON([("aggregate", self._aggregation_target),
  ("pipeline", self._pipeline)])
@@ -117,8 +109,7 @@ def get_cursor(self, session, server, sock_info, secondary_ok):
  # - server version is >= 4.2 or
  # - server version is >= 3.2 and pipeline doesn't use $out
  if (('readConcern' not in cmd) and
- ((sock_info.max_wire_version >= 4 and
- not self._performs_write) or
+ (not self._performs_write or
  (sock_info.max_wire_version >= 8))):
  read_concern = self._target.read_concern
  else:
@@ -218,11 +209,3 @@ def _cursor_collection(self, cursor):
  # aggregate too by defaulting to the <db>.$cmd.aggregate namespace.
  _, collname = cursor.get("ns", self._cursor_namespace).split(".", 1)
  return self._database[collname]
-
- @staticmethod
- def _check_compat(sock_info):
- # Older server version don't raise a descriptive error, so we raise
- # one instead.
- if not sock_info.max_wire_version >= 6:
- err_msg = "Database.aggregate() is only supported on MongoDB 3.6+."
- raise ConfigurationError(err_msg)

pymongo/aggregation.py

@@ -455,10 +455,6 @@ def _authenticate_x509(credentials, sock_info):
  return
 
  cmd = _X509Context(credentials).speculate_command()
- if credentials.username is None and sock_info.max_wire_version < 5:
- raise ConfigurationError(
- "A username is required for MONGODB-X509 authentication "
- "when connected to MongoDB versions older than 3.4.")
  sock_info.command('$external', cmd)
 
 
@@ -496,10 +492,8 @@ def _authenticate_default(credentials, sock_info):
  return _authenticate_scram(credentials, sock_info, 'SCRAM-SHA-256')
  else:
  return _authenticate_scram(credentials, sock_info, 'SCRAM-SHA-1')
- elif sock_info.max_wire_version >= 3:
- return _authenticate_scram(credentials, sock_info, 'SCRAM-SHA-1')
  else:
- return _authenticate_mongo_cr(credentials, sock_info)
+ return _authenticate_scram(credentials, sock_info, 'SCRAM-SHA-1')
 
 
 _AUTH_MAP = {

pymongo/auth.py

@@ -35,7 +35,6 @@
  InvalidOperation,
  OperationFailure)
 from pymongo.message import (_INSERT, _UPDATE, _DELETE,
- _do_batched_insert,
  _randint,
  _BulkWriteContext,
  _EncryptedBulkWriteContext)
@@ -256,17 +255,6 @@ def gen_unordered(self):
 
  def _execute_command(self, generator, write_concern, session,
  sock_info, op_id, retryable, full_result):
- if sock_info.max_wire_version < 5:
- if self.uses_collation:
- raise ConfigurationError(
- 'Must be connected to MongoDB 3.4+ to use a collation.')
- if self.uses_hint:
- raise ConfigurationError(
- 'Must be connected to MongoDB 3.4+ to use hint.')
- if sock_info.max_wire_version < 6 and self.uses_array_filters:
- raise ConfigurationError(
- 'Must be connected to MongoDB 3.6+ to use arrayFilters.')
-
  db_name = self.collection.database.name
  client = self.collection.database.client
  listeners = client._event_listeners
@@ -283,7 +271,7 @@ def _execute_command(self, generator, write_concern, session,
  ('ordered', self.ordered)])
  if not write_concern.is_server_default:
  cmd['writeConcern'] = write_concern.document
- if self.bypass_doc_val and sock_info.max_wire_version >= 4:
+ if self.bypass_doc_val:
  cmd['bypassDocumentValidation'] = True
  bwc = self.bulk_ctx_class(
  db_name, cmd, sock_info, op_id, listeners, session,
@@ -358,24 +346,6 @@ def retryable_bulk(session, sock_info, retryable):
  _raise_bulk_write_error(full_result)
  return full_result
 
- def execute_insert_no_results(self, sock_info, run, op_id, acknowledged):
- """Execute insert, returning no results.
- """
- command = SON([('insert', self.collection.name),
- ('ordered', self.ordered)])
- concern = {'w': int(self.ordered)}
- command['writeConcern'] = concern
- if self.bypass_doc_val and sock_info.max_wire_version >= 4:
- command['bypassDocumentValidation'] = True
- db = self.collection.database
- bwc = _BulkWriteContext(
- db.name, command, sock_info, op_id, db.client._event_listeners,
- None, _INSERT, self.collection.codec_options)
- # Legacy batched OP_INSERT.
- _do_batched_insert(
- self.collection.full_name, run.ops, True, acknowledged, concern,
- not self.ordered, self.collection.codec_options, bwc)
-
  def execute_op_msg_no_results(self, sock_info, generator):
  """Execute write commands with OP_MSG and w=0 writeConcern, unordered.
  """
@@ -441,62 +411,13 @@ def execute_no_results(self, sock_info, generator):
  raise ConfigurationError(
  'hint is unsupported for unacknowledged writes.')
  # Cannot have both unacknowledged writes and bypass document validation.
- if self.bypass_doc_val and sock_info.max_wire_version >= 4:
+ if self.bypass_doc_val:
  raise OperationFailure("Cannot set bypass_document_validation with"
  " unacknowledged write concern")
 
- # OP_MSG
- if sock_info.max_wire_version > 5:
- if self.ordered:
- return self.execute_command_no_results(sock_info, generator)
- return self.execute_op_msg_no_results(sock_info, generator)
-
- coll = self.collection
- # If ordered is True we have to send GLE or use write
- # commands so we can abort on the first error.
- write_concern = WriteConcern(w=int(self.ordered))
- op_id = _randint()
-
- next_run = next(generator)
- while next_run:
- # An ordered bulk write needs to send acknowledged writes to short
- # circuit the next run. However, the final message on the final
- # run can be unacknowledged.
- run = next_run
- next_run = next(generator, None)
- needs_ack = self.ordered and next_run is not None
- try:
- if run.op_type == _INSERT:
- self.execute_insert_no_results(
- sock_info, run, op_id, needs_ack)
- elif run.op_type == _UPDATE:
- for operation in run.ops:
- doc = operation['u']
- check_keys = True
- if doc and next(iter(doc)).startswith('$'):
- check_keys = False
- coll._update(
- sock_info,
- operation['q'],
- doc,
- upsert=operation['upsert'],
- check_keys=check_keys,
- multi=operation['multi'],
- write_concern=write_concern,
- op_id=op_id,
- ordered=self.ordered,
- bypass_doc_val=self.bypass_doc_val)
- else:
- for operation in run.ops:
- coll._delete(sock_info,
- operation['q'],
- not operation['limit'],
- write_concern,
- op_id,
- self.ordered)
- except OperationFailure:
- if self.ordered:
- break
+ if self.ordered:
+ return self.execute_command_no_results(sock_info, generator)
+ return self.execute_op_msg_no_results(sock_info, generator)
 
  def execute(self, write_concern, session):
  """Execute operations.