[Python-modules-commits] r16316 - in packages/python-mongoengine/trunk/debian (2 files)

[janos-guest at users.alioth.debian.org]

    Date: Saturday, April 2, 2011 @ 16:20:04
  Author: janos-guest
Revision: 16316

Improve patch

Modified:
  packages/python-mongoengine/trunk/debian/changelog
  packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility

Modified: packages/python-mongoengine/trunk/debian/changelog
===================================================================
--- packages/python-mongoengine/trunk/debian/changelog	2011-04-02 14:38:31 UTC (rev 16315)
+++ packages/python-mongoengine/trunk/debian/changelog	2011-04-02 16:20:04 UTC (rev 16316)
@@ -1,9 +1,12 @@
 python-mongoengine (0.4-2) unstable; urgency=low
 
   * Move tests to mongoengine module. (Closes: #620397)
-  * Add fix-pymongo-1.10-compatibility patch.
+  * Add debian/patches/fix-pymongo-1.10-compatibility
+    - PyMongo changed map_reduce method in Collection class to require third
+      parameter 'out' for output collection name. This patch is fixing this
+      without breaking compatibility with earlier versions of PyMongo.
 
- -- Janos Guljas <janos at resenje.org>  Sat, 02 Apr 2011 01:21:32 +0200
+ -- Janos Guljas <janos at resenje.org>  Sat, 02 Apr 2011 17:48:34 +0200
 
 python-mongoengine (0.4-1) unstable; urgency=low
 

Modified: packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility
===================================================================
--- packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility	2011-04-02 14:38:31 UTC (rev 16315)
+++ packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility	2011-04-02 16:20:04 UTC (rev 16316)
@@ -1,16 +1,20 @@
 Description: Fix compatibility with PyMongo 1.10
+ PyMongo changed map_reduce method in Collection class to require third
+ parameter 'out' for output collection name. This patch is fixing this
+ without breaking compatibility with earlier versions of PyMongo.
 Author: Janos Guljas <janos at resenje.org>
 Last-Update: 2011-04-02
 
 --- python-mongoengine-0.4.orig/mongoengine/queryset.py
 +++ python-mongoengine-0.4/mongoengine/queryset.py
-@@ -732,7 +732,8 @@ class QuerySet(object):
+@@ -732,7 +732,9 @@ class QuerySet(object):
          if limit:
              mr_args['limit'] = limit
  
 -        results = self._collection.map_reduce(map_f, reduce_f, **mr_args)
 +        results = self._collection.map_reduce(map_f, reduce_f,
-+                                              '__map_reduce_results', **mr_args)
++                                              out='__map_reduce_results',
++                                              **mr_args)
          results = results.find()
  
          if self._ordering: