Removed keeptemp from map_reduce as 0.5 requires pymongo 1.11

Closes MongoEngine#258
wpjunior · Aug 17, 2011 · 11621c6 · 11621c6
1 parent 97ac7e5
commit 11621c6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mongoengine/queryset.py b/mongoengine/queryset.py
@@ -872,7 +872,7 @@ def __len__(self):
         return self.count()
 
     def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
-                   scope=None, keep_temp=False):
+                   scope=None):
         """Perform a map/reduce query using the current query spec
         and ordering. While ``map_reduce`` respects ``QuerySet`` chaining,
         it must be the last call made, as it does not return a maleable
@@ -920,7 +920,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
         reduce_f_code = self._sub_js_fields(reduce_f)
         reduce_f = pymongo.code.Code(reduce_f_code, reduce_f_scope)
 
-        mr_args = {'query': self._query, 'keeptemp': keep_temp}
+        mr_args = {'query': self._query}
 
         if finalize_f:
             finalize_f_scope = {}
@@ -937,7 +937,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
         if limit:
             mr_args['limit'] = limit
 
-        if output == 'inline' or (not keep_temp and not self._ordering):
+        if output == 'inline' and not self._ordering:
             map_reduce_function = 'inline_map_reduce'
         else:
             map_reduce_function = 'map_reduce'
@@ -1514,7 +1514,7 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
                 return total;
             }
         """
-        values = self.map_reduce(map_func, reduce_func, 'inline', keep_temp=False)
+        values = self.map_reduce(map_func, reduce_func, 'inline')
         frequencies = {}
         for f in values:
             key = f.key