Updated aggregate parameter PYTHON-366

Author: rozza

pymongo/collection.py

@@ -889,7 +889,7 @@ def options(self):
 
         return options
 
-    def aggregate(self, ops):
+    def aggregate(self, pipeline):
         """Perform an aggregation using the aggregation framework on this
         collection.
 
@@ -901,7 +901,7 @@ def aggregate(self, ops):
         `aggregate command`_. will be sent to a secondary or slave.
 
         :Parameters:
-          - `ops`: a single command or list of aggregation commands
+          - `pipeline`: a single command or list of aggregation commands
 
         .. note:: Requires server version **>= 2.1.1**
 
@@ -910,16 +910,16 @@ def aggregate(self, ops):
         .. _aggregate command:
             http://docs.mongodb.org/manual/applications/aggregation
         """
-        if not isinstance(ops, (dict, list, tuple)):
-            raise TypeError("ops must be a dict, list or tuple")
+        if not isinstance(pipeline, (dict, list, tuple)):
+            raise TypeError("pipeline must be a dict, list or tuple")
 
-        if isinstance(ops, dict):
-            ops = [ops]
+        if isinstance(pipeline, dict):
+            pipeline = [pipeline]
 
         use_master = not self.slave_okay and not self.read_preference
 
         return self.__database.command("aggregate", self.__name,
-                                        pipeline=ops,
+                                        pipeline=pipeline,
                                         read_preference=self.read_preference,
                                         slave_okay=self.slave_okay,
                                         _use_master=use_master)

test/test_collection.py

@@ -1056,11 +1056,11 @@ def test_aggregate(self):
 
         self.assertRaises(TypeError, db.test.aggregate, "wow")
 
-        ops = {"$project": {"_id": False, "foo": True}}
+        pipeline = {"$project": {"_id": False, "foo": True}}
         expected = {'ok': 1.0, 'result': [{'foo': [1, 2]}]}
-        self.assertEqual(expected, db.test.aggregate(ops))
-        self.assertEqual(expected, db.test.aggregate([ops]))
-        self.assertEqual(expected, db.test.aggregate((ops,)))
+        self.assertEqual(expected, db.test.aggregate(pipeline))
+        self.assertEqual(expected, db.test.aggregate([pipeline]))
+        self.assertEqual(expected, db.test.aggregate((pipeline,)))
 
     def test_group(self):
         db = self.db