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

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

    Date: Friday, April 1, 2011 @ 23:38:29
  Author: janos-guest
Revision: 16311

Fix Bug #620397 and PyMongo 1.10 comaptibility

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

Modified: packages/python-mongoengine/trunk/debian/changelog
===================================================================
--- packages/python-mongoengine/trunk/debian/changelog	2011-04-01 14:38:53 UTC (rev 16310)
+++ packages/python-mongoengine/trunk/debian/changelog	2011-04-01 23:38:29 UTC (rev 16311)
@@ -1,3 +1,10 @@
+python-mongoengine (0.4-2) unstable; urgency=low
+
+  * Move tests to mongoengine module. (Closes: #620397)
+  * Add fix-pymongo-1.10-compatibility patch.
+
+ -- Janos Guljas <janos at resenje.org>  Sat, 02 Apr 2011 01:21:32 +0200
+
 python-mongoengine (0.4-1) unstable; urgency=low
 
   * Initial release. (Closes: #609850)

Added: packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility
===================================================================
--- packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility	                        (rev 0)
+++ packages/python-mongoengine/trunk/debian/patches/fix-pymongo-1.10-compatibility	2011-04-01 23:38:29 UTC (rev 16311)
@@ -0,0 +1,16 @@
+Description: Fix compatibility with PyMongo 1.10
+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):
+         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)
+         results = results.find()
+ 
+         if self._ordering:

Added: packages/python-mongoengine/trunk/debian/patches/series
===================================================================
--- packages/python-mongoengine/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-mongoengine/trunk/debian/patches/series	2011-04-01 23:38:29 UTC (rev 16311)
@@ -0,0 +1 @@
+fix-pymongo-1.10-compatibility

Modified: packages/python-mongoengine/trunk/debian/rules
===================================================================
--- packages/python-mongoengine/trunk/debian/rules	2011-04-01 14:38:53 UTC (rev 16310)
+++ packages/python-mongoengine/trunk/debian/rules	2011-04-01 23:38:29 UTC (rev 16311)
@@ -6,6 +6,7 @@
 	dh $@ --with python2
 
 override_dh_auto_build:
+	mv tests mongoengine
 	dh_auto_build
 	cp -r docs docs.debian
 	make -C docs.debian html