File fix-32bit.patch of Package python-Cython
From 65408e6c70074c4fec128805888d18c7e933895a Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Fri, 13 Feb 2015 14:38:32 +0100
Subject: [PATCH] fix doctests in 32bit Py2.x
---
tests/run/carray_coercion.pyx | 23 +++++++++++++++++++----
tests/run/reversed_iteration.pyx | 35 +++++++++++++++++++++++------------
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/tests/run/carray_coercion.pyx b/tests/run/carray_coercion.pyx
index d73fcf4..f04f820 100644
--- a/tests/run/carray_coercion.pyx
+++ b/tests/run/carray_coercion.pyx
@@ -1,3 +1,18 @@
+# mode: run
+
+import sys
+IS_PY3 = sys.version_info[0] >= 3
+IS_32BIT_PY2 = not IS_PY3 and sys.maxint < 2**32
+
+
+def unlongify(v):
+ # on 32bit Py2.x platforms, 'unsigned int' coerces to a Python long => fix doctest output here.
+ s = repr(v)
+ if IS_32BIT_PY2:
+ assert s.count('L') == s.count(',') + 1, s
+ s = s.replace('L', '')
+ return s
+
def from_int_array():
"""
@@ -30,8 +45,8 @@ cdef extern from "stdint.h":
def from_typedef_int_array():
"""
- >>> from_typedef_int_array()
- [1, 2, 3]
+ >>> unlongify(from_typedef_int_array())
+ '[1, 2, 3]'
"""
cdef uint32_t[3] v
v[0] = 1
@@ -42,8 +57,8 @@ def from_typedef_int_array():
cpdef tuple tuple_from_typedef_int_array():
"""
- >>> tuple_from_typedef_int_array()
- (1, 2, 3)
+ >>> unlongify(tuple_from_typedef_int_array())
+ '(1, 2, 3)'
"""
cdef uint32_t[3] v
v[0] = 1
diff --git a/tests/run/reversed_iteration.pyx b/tests/run/reversed_iteration.pyx
index 585d0df..0f55060 100644
--- a/tests/run/reversed_iteration.pyx
+++ b/tests/run/reversed_iteration.pyx
@@ -5,6 +5,17 @@ cimport cython
import sys
IS_PY3 = sys.version_info[0] >= 3
+IS_32BIT_PY2 = not IS_PY3 and sys.maxint < 2**32
+
+
+def unlongify(v):
+ # on 32bit Py2.x platforms, 'unsigned int' coerces to a Python long => fix doctest output here.
+ s = repr(v)
+ if IS_32BIT_PY2:
+ assert s.count('L') == s.count(',') + 1, s
+ s = s.replace('L', '')
+ return s
+
def _reversed(it):
return list(it)[::-1]
@@ -764,10 +775,10 @@ def reversed_bytes_slice_step_only(bytes s):
@cython.test_assert_path_exists('//ForFromStatNode')
def reversed_unsigned(int a, int b):
"""
- >>> reversed_unsigned(0, 5)
- [4, 3, 2, 1, 0]
- >>> reversed_unsigned(1, 5)
- [4, 3, 2, 1]
+ >>> unlongify(reversed_unsigned(0, 5))
+ '[4, 3, 2, 1, 0]'
+ >>> unlongify(reversed_unsigned(1, 5))
+ '[4, 3, 2, 1]'
>>> reversed_unsigned(1, 1)
[]
"""
@@ -777,10 +788,10 @@ def reversed_unsigned(int a, int b):
@cython.test_assert_path_exists('//ForFromStatNode')
def reversed_unsigned_by_3(int a, int b):
"""
- >>> reversed_unsigned_by_3(0, 5)
- [3, 0]
- >>> reversed_unsigned_by_3(0, 7)
- [6, 3, 0]
+ >>> unlongify(reversed_unsigned_by_3(0, 5))
+ '[3, 0]'
+ >>> unlongify(reversed_unsigned_by_3(0, 7))
+ '[6, 3, 0]'
"""
cdef unsigned int i
return [i for i in reversed(range(a, b, 3))]
@@ -788,10 +799,10 @@ def reversed_unsigned_by_3(int a, int b):
@cython.test_assert_path_exists('//ForFromStatNode')
def range_unsigned_by_neg_3(int a, int b):
"""
- >>> range_unsigned_by_neg_3(-1, 6)
- [6, 3, 0]
- >>> range_unsigned_by_neg_3(0, 7)
- [7, 4, 1]
+ >>> unlongify(range_unsigned_by_neg_3(-1, 6))
+ '[6, 3, 0]'
+ >>> unlongify(range_unsigned_by_neg_3(0, 7))
+ '[7, 4, 1]'
"""
cdef unsigned int i
return [i for i in range(b, a, -3)]