PYTHON-1014 - Unrecognized $ operators now included in find command

Author: aherlihy

pymongo/message.py

@@ -171,8 +171,10 @@ def _gen_find_command(coll, spec, projection, skip, limit, batch_size,
  """Generate a find command document."""
  cmd = SON([('find', coll)])
  if '$query' in spec:
- cmd.update([(_MODIFIERS[key], val)
- for key, val in spec.items() if key in _MODIFIERS])
+ cmd.update([(_MODIFIERS[key], val) if key in _MODIFIERS else (key, val)
+ for key, val in spec.items()])
+ if '$explain' in cmd:
+ cmd.pop('$explain')
  else:
  cmd['filter'] = spec
 

test/test_collection.py

@@ -47,7 +47,7 @@
  InvalidOperation,
  OperationFailure,
  WriteConcernError)
-from pymongo.message import _COMMAND_OVERHEAD
+from pymongo.message import _COMMAND_OVERHEAD, _gen_find_command
 from pymongo.operations import *
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import (InsertOneResult,
@@ -2144,6 +2144,12 @@ def test_find_regex(self):
  for doc in c.find():
  self.assertTrue(isinstance(doc['r'], Regex))
 
+ def test_find_command_generation(self):
+ cmd = _gen_find_command(
+ 'coll', {'$query': {'foo': 1}, '$dumb': 2}, None, 0, 0, 0, None)
+ self.assertEqual(
+ cmd, SON([('find', 'coll'), ('$dumb', 2), ('filter', {'foo': 1})]))
+
 
 if __name__ == "__main__":
  unittest.main()