[Python-apps-team] Bug#651996: (no subject)

[Barry Warsaw]

We already fixed this in Ubuntu, using an upstream unreleased patch.  I just
tested this out with the Debian version of the package and it fixes the
failure there too.  Here's the diff.

-Barry

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-20 10:35:03 +0000
+++ debian/changelog	2012-01-03 18:08:38 +0000
@@ -1,3 +1,11 @@
+cython (0.15.1-2) UNRELEASED; urgency=low
+
+  * 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)
+
+ -- Barry Warsaw <barry at python.org>  Tue, 03 Jan 2012 13:07:26 -0500
+
 cython (0.15.1-1) unstable; urgency=low
 
   [ Nikolaus Rath ]

=== added file 'debian/patches/python27-testsuite-fix.patch'
--- debian/patches/python27-testsuite-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/python27-testsuite-fix.patch	2012-01-03 18:06:57 +0000
@@ -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 file 'debian/patches/series'
--- debian/patches/series	2011-09-20 10:35:03 +0000
+++ debian/patches/series	2012-01-03 18:06:57 +0000
@@ -1,1 +1,2 @@
 deb_tempdisable_numpy_doctests
+python27-testsuite-fix.patch


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/python-apps-team/attachments/20120103/3184e6c8/attachment.pgp>