[Python-apps-commits] r8043 - in packages/cython/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Saturday, January 7, 2012 @ 18:10:05
  Author: yoh
Revision: 8043

Fix FTBFS #651996

through adjusting
wget -O- http://bugs.debian.org/cgi-bin/bugreport.cgi\?msg\=8\;att\=0\;bug\=651996 | patch -p0

Added:
  packages/cython/trunk/debian/patches/python27-testsuite-fix.patch
Modified:
  packages/cython/trunk/debian/changelog
  packages/cython/trunk/debian/patches/series

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2012-01-07 15:37:41 UTC (rev 8042)
+++ packages/cython/trunk/debian/changelog	2012-01-07 18:10:05 UTC (rev 8043)
@@ -1,9 +1,15 @@
-cython (0.15.1-2) UNRELEASED; urgency=low
+cython (0.15.1-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Strip CRs from upstream changelogs.
 
- -- Jakub Wilk <jwilk at debian.org>  Tue, 20 Sep 2011 16:59:00 +0200
+  [ Barry Warsaw ]
+  * debian/patches/python27-testsuite-fix.patch:
+    Fix test suite for Python 2.7 change.  Patch comes from Cython
+    upstream, post 0.15.1 release.  (Closes: #651996)
 
+ -- Yaroslav Halchenko <debian at onerussian.com>  Sat, 07 Jan 2012 12:32:25 -0500
+
 cython (0.15.1-1) unstable; urgency=low
 
   [ Nikolaus Rath ]

Added: packages/cython/trunk/debian/patches/python27-testsuite-fix.patch
===================================================================
--- packages/cython/trunk/debian/patches/python27-testsuite-fix.patch	                        (rev 0)
+++ packages/cython/trunk/debian/patches/python27-testsuite-fix.patch	2012-01-07 18:10:05 UTC (rev 8043)
@@ -0,0 +1,43 @@
+Description: Upstream fix (post 0.15.1 release) to work around changes
+ in Python 2.7's indexing error message.
+Origin: https://github.com/cython/cython/commit/b623fb856a82d2ece1e2f04fb32309384ab0cb7e.diff
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cython/+bug/901840/+index
+Forwarded: not-needed
+
+diff --git a/tests/run/dict_getitem.pyx b/tests/run/dict_getitem.pyx
+index 845ac7f..40e05e8 100644
+--- a/tests/run/dict_getitem.pyx
++++ b/tests/run/dict_getitem.pyx
+@@ -21,7 +21,7 @@ def test(dict d, index):
+ 
+     >>> test(None, 1) # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+-    TypeError: ...subscriptable...
++    TypeError: ...object...
+     """
+     return d[index]
+ 
+diff --git a/tests/run/index.pyx b/tests/run/index.pyx
+index 22cec2b..74eec6e 100644
+--- a/tests/run/index.pyx
++++ b/tests/run/index.pyx
+@@ -1,15 +1,13 @@
+ __doc__ = u"""
+-    >>> index_object(100, 100)
++    >>> index_object(100, 100)       # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+     ...
+-    TypeError: 'int' object is unsubscriptable
++    TypeError: 'int' object ...
+ """
+ 
+ import sys
+-if sys.version_info >= (2,7):
+-    __doc__ = __doc__.replace(u'is unsubscriptable', u'is not subscriptable')
+-elif sys.version_info < (2,5):
+-    __doc__ = __doc__.replace(u"'int' object is unsubscriptable", u'unsubscriptable object')
++if sys.version_info < (2,5):
++    __doc__ = __doc__.replace(u"'int' object ...", u'unsubscriptable object')
+ 
+ import cython
+ 

Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series	2012-01-07 15:37:41 UTC (rev 8042)
+++ packages/cython/trunk/debian/patches/series	2012-01-07 18:10:05 UTC (rev 8043)
@@ -1 +1,2 @@
 deb_tempdisable_numpy_doctests
+python27-testsuite-fix.patch