PYTHON-328 - Added support as_class in find_and_modify

Author: rozza

pymongo/database.py

@@ -314,6 +314,9 @@ def command(self, command, value=1,
           - `**kwargs` (optional): additional keyword arguments will
             be added to the command document before it is sent
 
+        .. versionchanged:: 2.1.1+
+           Added support for `as_class` - the class you want to use for
+           the resulting documents
         .. versionchanged:: 1.6
            Added the `value` argument for string commands, and keyword
            arguments for additional command options.
@@ -328,6 +331,7 @@ def command(self, command, value=1,
             command = SON([(command, value)])
 
         extra_opts = {
+            'as_class': kwargs.pop('as_class', None),
             'read_preference': kwargs.pop('read_preference',
                                           self.read_preference),
             'slave_okay': kwargs.pop('slave_okay', self.slave_okay),

test/test_collection.py

@@ -1527,6 +1527,17 @@ def test_find_and_modify(self):
                          c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
                                            new=True, fields={'i': 1}))
 
+        class ExtendedDict(dict):
+            pass
+
+        result = c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
+                                    new=True, fields={'i': 1})
+        self.assertFalse(isinstance(result, ExtendedDict))
+        result = c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
+                                    new=True, fields={'i': 1},
+                                    as_class=ExtendedDict)
+        self.assertTrue(isinstance(result, ExtendedDict))
+
     def test_find_with_nested(self):
         if not version.at_least(self.db.connection, (2, 0, 0)):
             raise SkipTest()