[Python-modules-commits] r10645 - in packages/python-django/trunk/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Wednesday, December 2, 2009 @ 00:12:50
  Author: lamby
Revision: 10645

Fix FTBFS under Python 2.6.3 by applying patch from upstream bug #11993. (Closes: #555969)

Added:
  packages/python-django/trunk/debian/patches/06_python_2.6.3_regression.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2009-12-02 00:12:24 UTC (rev 10644)
+++ packages/python-django/trunk/debian/changelog	2009-12-02 00:12:50 UTC (rev 10645)
@@ -5,6 +5,8 @@
     behaviour. (Closes: #555419)
   * Fix FTBFS in November by applying patch from upstream bug #12125.
     (Closes: #555931)
+  * Fix FTBFS under Python 2.6.3 by applying patch from upstream bug #11993.
+    (Closes: #555969)
 
  -- Chris Lamb <lamby at debian.org>  Tue, 01 Dec 2009 22:44:27 +0000
 

Added: packages/python-django/trunk/debian/patches/06_python_2.6.3_regression.diff
===================================================================
--- packages/python-django/trunk/debian/patches/06_python_2.6.3_regression.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/06_python_2.6.3_regression.diff	2009-12-02 00:12:50 UTC (rev 10645)
@@ -0,0 +1,14 @@
+Forwarded-Upstream: http://code.djangoproject.com/changeset/11619
+Comment:
+ Fix FTBFS under Python 2.6.3; int(Decimal('nan')) raises ValueError instead
+ of returning None.
+
+--- ./django/template/defaultfilters.py (revision 10543)
++++ ./django/template/defaultfilters.py (revision 11619)
+@@ -163,5 +163,5 @@
+     try:
+         m = int(d) - d
+-    except (OverflowError, InvalidOperation):
++    except (ValueError, OverflowError, InvalidOperation):
+         return input_val
+ 

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2009-12-02 00:12:24 UTC (rev 10644)
+++ packages/python-django/trunk/debian/patches/series	2009-12-02 00:12:50 UTC (rev 10645)
@@ -3,3 +3,4 @@
 03_manpage.diff
 04_hyphen-manpage.diff
 05_ftbfs_in_november.diff
+06_python_2.6.3_regression.diff