[Python-apps-commits] r7552 - in packages/cython/trunk/debian (7 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Wed Sep 14 22:51:19 UTC 2011
Date: Wednesday, September 14, 2011 @ 22:51:18
Author: nikratio-guest
Revision: 7552
Updated to new upstream release.
Modified:
packages/cython/trunk/debian/changelog
packages/cython/trunk/debian/patches/series
Deleted:
packages/cython/trunk/debian/patches/0001-Python-3-fix-NumPy-support.patch
packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch
packages/cython/trunk/debian/patches/0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch
packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch
packages/cython/trunk/debian/patches/0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch
Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/changelog 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,3 +1,18 @@
+cython (0.15-1) UNRELEASED; urgency=low
+
+ * New upstream version (Closes: #637388)
+ * Dropped patches, have been incorporated upstream:
+ 0001-fix-makefile-for-embed-testcase.patch
+ 0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch
+ 0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch
+ 0001-additional-fix-and-test-for-ticket-650.patch
+ 0001-Python-3-fix-NumPy-support.patch
+ * cython --help no longer mentions -r option (Closes: 607097)
+ * Compiles cleanly with Python 2.7 (Closes: 627773)
+ * Fixed compile time division (Closes: #641128)
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 14 Sep 2011 18:36:37 -0400
+
cython (0.14.1-7) UNRELEASED; urgency=low
* Fix shebang before dh_pysupport is called, to remove unnecessary
Deleted: packages/cython/trunk/debian/patches/0001-Python-3-fix-NumPy-support.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-Python-3-fix-NumPy-support.patch 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/0001-Python-3-fix-NumPy-support.patch 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,286 +0,0 @@
-From e12615215b862bf1a240252dd35a90906794559a Mon Sep 17 00:00:00 2001
-From: Lisandro Dalcin <dalcinl at gmail.com>
-Date: Fri, 18 Feb 2011 13:00:03 -0300
-Subject: [PATCH] Python 3: fix NumPy support
-
----
- Cython/Compiler/Buffer.py | 12 ++++++++-
- Cython/Compiler/Interpreter.py | 8 +++++-
- Cython/Includes/numpy.pxd | 7 ++++-
- tests/run/numpy_test.pyx | 51 ++++++++++++++++++++-------------------
- 4 files changed, 48 insertions(+), 30 deletions(-)
-
-diff --git a/Cython/Compiler/Buffer.py b/Cython/Compiler/Buffer.py
-index 3584234..86eb69c 100644
---- a/Cython/Compiler/Buffer.py
-+++ b/Cython/Compiler/Buffer.py
-@@ -527,8 +527,7 @@ def use_py2_buffer_functions(env):
- #if PY_MAJOR_VERSION < 3
- static int __Pyx_GetBuffer(PyObject *obj, Py_buffer *view, int flags) {
- #if PY_VERSION_HEX >= 0x02060000
-- if (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_NEWBUFFER)
-- return PyObject_GetBuffer(obj, view, flags);
-+ if (PyObject_CheckBuffer(obj)) return PyObject_GetBuffer(obj, view, flags);
- #endif
- """)
- if len(types) > 0:
-@@ -548,11 +547,15 @@ def use_py2_buffer_functions(env):
- static void __Pyx_ReleaseBuffer(Py_buffer *view) {
- PyObject* obj = view->obj;
- if (obj) {
-+ #if PY_VERSION_HEX >= 0x02060000
-+ if (PyObject_CheckBuffer(obj)) {PyBuffer_Release(view); return;}
-+ #endif
- """)
- if len(types) > 0:
- clause = "if"
- for t, get, release in types:
- if release:
-+ code += " "
- code += "%s (PyObject_TypeCheck(obj, %s)) %s(obj, view);" % (clause, t, release)
- clause = "else if"
- code += dedent("""
-@@ -1114,6 +1117,11 @@ static const char* __Pyx_BufFmt_CheckString(__Pyx_BufFmt_Context* ctx, const cha
- ctx->new_count = 1;
- got_Z = 0;
- break;
-+ case ':':
-+ ++ts;
-+ while(*ts != ':') ++ts;
-+ ++ts;
-+ break;
- default:
- {
- ctx->new_count = __Pyx_BufFmt_ParseNumber(&ts);
-diff --git a/Cython/Compiler/Interpreter.py b/Cython/Compiler/Interpreter.py
-index 83cb184..44357fb 100644
---- a/Cython/Compiler/Interpreter.py
-+++ b/Cython/Compiler/Interpreter.py
-@@ -6,6 +6,7 @@ For now this only covers parse tree to value conversion of
- compile-time values.
- """
-
-+import sys
- from Nodes import *
- from ExprNodes import *
- from Errors import CompileError
-@@ -44,6 +45,10 @@ def interpret_compiletime_options(optlist, optdict, type_env=None, type_args=())
- else:
- raise CompileError(node.pos, "Type not allowed here.")
- else:
-+ if (sys.version_info[0] >=3 and
-+ isinstance(node, StringNode) and
-+ node.unicode_value is not None):
-+ return (node.unicode_value, node.pos)
- return (node.compile_time_value(empty_scope), node.pos)
-
- if optlist:
-@@ -52,6 +57,7 @@ def interpret_compiletime_options(optlist, optdict, type_env=None, type_args=())
- assert isinstance(optdict, DictNode)
- new_optdict = {}
- for item in optdict.key_value_pairs:
-- new_optdict[item.key.value] = interpret(item.value, item.key.value)
-+ new_key, dummy = interpret(item.key, None)
-+ new_optdict[new_key] = interpret(item.value, item.key.value)
- optdict = new_optdict
- return (optlist, new_optdict)
-diff --git a/Cython/Includes/numpy.pxd b/Cython/Includes/numpy.pxd
-index e0cf332..7ddd00b 100644
---- a/Cython/Includes/numpy.pxd
-+++ b/Cython/Includes/numpy.pxd
-@@ -737,11 +737,14 @@ ctypedef double complex complex128_t
- # numpy.int corresponds to 'l' and numpy.long to 'q'
- ctypedef npy_long int_t
- ctypedef npy_longlong long_t
--ctypedef npy_intp intp_t
--ctypedef npy_uintp uintp_t
-+ctypedef npy_longlong longlong_t
-
- ctypedef npy_ulong uint_t
- ctypedef npy_ulonglong ulong_t
-+ctypedef npy_ulonglong ulonglong_t
-+
-+ctypedef npy_intp intp_t
-+ctypedef npy_uintp uintp_t
-
- ctypedef npy_double float_t
- ctypedef npy_double double_t
-diff --git a/tests/run/numpy_test.pyx b/tests/run/numpy_test.pyx
-index 104670b..052d2ae 100644
---- a/tests/run/numpy_test.pyx
-+++ b/tests/run/numpy_test.pyx
-@@ -72,23 +72,23 @@ try:
- Write to slices
- >>> b = a.copy()
- >>> put_range_long_1d(b[:, 3])
-- >>> print b
-+ >>> print (b)
- [[0 1 2 0 4]
- [5 6 7 1 9]]
- >>> put_range_long_1d(b[::-1, 3])
-- >>> print b
-+ >>> print (b)
- [[0 1 2 1 4]
- [5 6 7 0 9]]
- >>> a = np.zeros(9, dtype='l')
- >>> put_range_long_1d(a[1::3])
-- >>> print a
-+ >>> print (a)
- [0 0 0 0 1 0 0 2 0]
-
- Write to picked subarrays. This should NOT change the original
- array as picking creates a new mutable copy.
- >>> a = np.zeros(10, dtype='l').reshape(2, 5)
- >>> put_range_long_1d(a[[0, 0, 1, 1, 0], [0, 1, 2, 4, 3]])
-- >>> print a
-+ >>> print (a)
- [[0 0 0 0 0]
- [0 0 0 0 0]]
-
-@@ -103,18 +103,18 @@ try:
- 0 1 2 3
- 4 5 6 7
- 8 9 10 11
-- >>> test_c_contig(f_arr)
-+ >>> test_c_contig(f_arr) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- ValueError: ndarray is not C contiguous
-- >>> test_f_contig(c_arr)
-+ ValueError: ndarray is not C...contiguous
-+ >>> test_f_contig(c_arr) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
- ValueError: ndarray is not Fortran contiguous
-- >>> test_c_contig(c_arr[::2,::2])
-+ >>> test_c_contig(c_arr[::2,::2]) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- ValueError: ndarray is not C contiguous
-+ ValueError: ndarray is not C...contiguous
-
- >>> test_dtype('b', inc1_byte)
- >>> test_dtype('B', inc1_ubyte)
-@@ -137,7 +137,7 @@ try:
- >>> test_dtype('G', inc1_clongdouble_struct)
-
- >>> test_dtype(np.int, inc1_int_t)
-- >>> test_dtype(np.long, inc1_long_t)
-+ >>> test_dtype(np.longlong, inc1_longlong_t)
- >>> test_dtype(np.float, inc1_float_t)
- >>> test_dtype(np.double, inc1_double_t)
- >>> test_dtype(np.intp, inc1_intp_t)
-@@ -150,10 +150,10 @@ try:
-
- Endian tests:
- >>> test_dtype('%si' % my_endian, inc1_int)
-- >>> test_dtype('%si' % other_endian, inc1_int)
-+ >>> test_dtype('%si' % other_endian, inc1_int) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- ValueError: Non-native byte order not supported
-+ ValueError: ...
-
-
-
-@@ -181,15 +181,15 @@ try:
- array([(22, 23)],
- dtype=[('f0', '|i1'), ('', '|V3'), ('f1', '!i4')])
-
-- >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=True))))
-+ >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=True)))) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- ValueError: Buffer dtype mismatch; next field is at offset 4 but 1 expected
-+ ValueError: ...
-
-- >>> print(test_unpacked_align(np.zeros((1,), dtype=np.dtype('b,i', align=False))))
-+ >>> print(test_unpacked_align(np.zeros((1,), dtype=np.dtype('b,i', align=False)))) #doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- ValueError: Buffer dtype mismatch; next field is at offset 1 but 4 expected
-+ ValueError: ...
-
-
- >>> test_good_cast()
-@@ -235,17 +235,17 @@ def ndarray_str(arr):
- return unicode(arr).replace(u'\n\n', u'\n<_BLANKLINE_>\n')
-
- def basic():
-- cdef object[int, ndim=2] buf = np.arange(10, dtype=b'i').reshape((2, 5))
-+ cdef object[int, ndim=2] buf = np.arange(10, dtype='i').reshape((2, 5))
- print buf
- print buf[0, 2], buf[0, 0], buf[1, 4], buf[1, 0]
-
- def three_dim():
-- cdef object[double, ndim=3] buf = np.arange(24, dtype=b'd').reshape((3,2,4))
-+ cdef object[double, ndim=3] buf = np.arange(24, dtype='d').reshape((3,2,4))
- print ndarray_str(buf)
- print buf[0, 1, 2], buf[0, 0, 0], buf[1, 1, 1], buf[1, 0, 0]
-
- def obj_array():
-- cdef object[object, ndim=1] buf = np.array([b"a", 1, {}])
-+ cdef object[object, ndim=1] buf = np.array(["a", 1, {}])
- print buf
- print buf[0], buf[1], buf[2]
-
-@@ -262,12 +262,12 @@ def put_range_long_1d(np.ndarray[long] arr):
- arr[i] = value
- value += 1
-
--def test_c_contig(np.ndarray[int, ndim=2, mode=b'c'] arr):
-+def test_c_contig(np.ndarray[int, ndim=2, mode='c'] arr):
- cdef int i, j
- for i in range(arr.shape[0]):
- print u" ".join([unicode(arr[i, j]) for j in range(arr.shape[1])])
-
--def test_f_contig(np.ndarray[int, ndim=2, mode=b'fortran'] arr):
-+def test_f_contig(np.ndarray[int, ndim=2, mode='fortran'] arr):
- cdef int i, j
- for i in range(arr.shape[0]):
- print u" ".join([unicode(arr[i, j]) for j in range(arr.shape[1])])
-@@ -314,6 +314,7 @@ def inc1_object(np.ndarray[object] arr):
-
- def inc1_int_t(np.ndarray[np.int_t] arr): arr[1] += 1
- def inc1_long_t(np.ndarray[np.long_t] arr): arr[1] += 1
-+def inc1_longlong_t(np.ndarray[np.longlong_t] arr): arr[1] += 1
- def inc1_float_t(np.ndarray[np.float_t] arr): arr[1] += 1
- def inc1_double_t(np.ndarray[np.double_t] arr): arr[1] += 1
- def inc1_longdouble_t(np.ndarray[np.longdouble_t] arr): arr[1] += 1
-@@ -330,7 +331,7 @@ def test_dtype(dtype, inc1):
- "G", np.clongdouble):
- if sizeof(double) == sizeof(long double): # MSVC
- return
-- if dtype in (b'F', b'D', b'G'):
-+ if dtype in ('F', 'D', 'G'):
- a = np.array([0, 10+10j], dtype=dtype)
- inc1(a)
- if a[1] != (11 + 11j): print u"failed!", a[1]
-@@ -344,7 +345,7 @@ cdef struct DoubleInt:
-
- def test_recordarray():
- cdef object[DoubleInt] arr
-- arr = np.array([(5,5), (4, 6)], dtype=np.dtype(b'i,i'))
-+ arr = np.array([(5,5), (4, 6)], dtype=np.dtype('i,i'))
- cdef DoubleInt rec
- rec = arr[0]
- if rec.x != 5: print u"failed"
-@@ -384,13 +385,13 @@ def test_bad_nested_dtypes():
-
- def test_good_cast():
- # Check that a signed int can round-trip through casted unsigned int access
-- cdef np.ndarray[unsigned int, cast=True] arr = np.array([-100], dtype=b'i')
-+ cdef np.ndarray[unsigned int, cast=True] arr = np.array([-100], dtype='i')
- cdef unsigned int data = arr[0]
- return -100 == <int>data
-
- def test_bad_cast():
- # This should raise an exception
-- cdef np.ndarray[int, cast=True] arr = np.array([1], dtype=b'b')
-+ cdef np.ndarray[int, cast=True] arr = np.array([1], dtype='b')
-
- cdef packed struct PackedStruct:
- char a
---
-1.7.2.3
-
Deleted: packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,38 +0,0 @@
-From eb0f739ffb5563c005573939ac076ce78c3e79a8 Mon Sep 17 00:00:00 2001
-From: Lisandro Dalcin <dalcinl at gmail.com>
-Date: Tue, 5 Apr 2011 14:29:36 -0300
-Subject: [PATCH] additional fix and test for ticket #650
-
----
- Cython/Compiler/Nodes.py | 4 +++-
- tests/run/raise_memory_error_T650.pyx | 9 +++++++++
- 2 files changed, 12 insertions(+), 1 deletions(-)
-
---- a/Cython/Compiler/Nodes.py
-+++ b/Cython/Compiler/Nodes.py
-@@ -3944,7 +3944,9 @@ class RaiseStatNode(StatNode):
- if self.exc_type and not self.exc_value and not self.exc_tb:
- exc = self.exc_type
- import ExprNodes
-- if isinstance(exc, ExprNodes.SimpleCallNode) and not exc.args:
-+ if (isinstance(exc, ExprNodes.SimpleCallNode) and
-+ not (exc.args or (exc.arg_tuple is not None and
-+ exc.arg_tuple.args))):
- exc = exc.function # extract the exception type
- if exc.is_name and exc.entry.is_builtin:
- self.builtin_exc_name = exc.name
---- a/tests/run/raise_memory_error_T650.pyx
-+++ b/tests/run/raise_memory_error_T650.pyx
-@@ -22,3 +22,12 @@ def raise_me_instance():
- ... else: print('NOT RAISED!')
- """
- raise MemoryError()
-+
-+def raise_me_instance_value():
-+ """
-+ >>> raise_me_instance_value()
-+ Traceback (most recent call last):
-+ ...
-+ MemoryError: oom
-+ """
-+ raise MemoryError("oom")
Deleted: packages/cython/trunk/debian/patches/0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,63 +0,0 @@
-From 475e9a085654252d5a274dab2118b746e8bda4eb Mon Sep 17 00:00:00 2001
-From: Lisandro Dalcin <dalcinl at gmail.com>
-Date: Fri, 18 Feb 2011 18:30:11 -0300
-Subject: [PATCH] fix inline textcase to not use default $HOME/.cython/inline
-
----
- Cython/Build/Tests/TestInline.py | 19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Cython/Build/Tests/TestInline.py b/Cython/Build/Tests/TestInline.py
-index b9ffade..6fb259f 100644
---- a/Cython/Build/Tests/TestInline.py
-+++ b/Cython/Build/Tests/TestInline.py
-@@ -1,3 +1,4 @@
-+import os, tempfile
- from Cython.Shadow import inline
- from Cython.Build.Inline import safe_type
- from Cython.TestUtils import CythonTest
-@@ -13,23 +14,31 @@ test_kwds = dict(force=True, quiet=True)
- global_value = 100
-
- class TestInline(CythonTest):
-+ def setUp(self):
-+ CythonTest.setUp(self)
-+ self.test_kwds = dict(test_kwds)
-+ if os.path.isdir('BUILD'):
-+ lib_dir = os.path.join('BUILD','inline')
-+ else:
-+ lib_dir = tempfile.mkdtemp(prefix='cython_inline_')
-+ self.test_kwds['lib_dir'] = lib_dir
-
- def test_simple(self):
-- self.assertEquals(inline("return 1+2", **test_kwds), 3)
-+ self.assertEquals(inline("return 1+2", **self.test_kwds), 3)
-
- def test_types(self):
- self.assertEquals(inline("""
- cimport cython
- return cython.typeof(a), cython.typeof(b)
-- """, a=1.0, b=[], **test_kwds), ('double', 'list object'))
-+ """, a=1.0, b=[], **self.test_kwds), ('double', 'list object'))
-
- def test_locals(self):
- a = 1
- b = 2
-- self.assertEquals(inline("return a+b", **test_kwds), 3)
-+ self.assertEquals(inline("return a+b", **self.test_kwds), 3)
-
- def test_globals(self):
-- self.assertEquals(inline("return global_value + 1", **test_kwds), global_value + 1)
-+ self.assertEquals(inline("return global_value + 1", **self.test_kwds), global_value + 1)
-
- if has_numpy:
-
-@@ -38,4 +47,4 @@ class TestInline(CythonTest):
- a = numpy.ndarray((10, 20))
- a[0,0] = 10
- self.assertEquals(safe_type(a), 'numpy.ndarray[numpy.float64_t, ndim=2]')
-- self.assertEquals(inline("return a[0,0]", a=a, **test_kwds), 10.0)
-+ self.assertEquals(inline("return a[0,0]", a=a, **self.test_kwds), 10.0)
---
-1.7.2.3
-
Deleted: packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,36 +0,0 @@
-From: Lisandro Dalcin <dalcinl at gmail.com>
-Date: Wed, 16 Feb 2011 18:55:06 -0300
-Vendor: upstream
-Subject: [PATCH] fix makefile for embed testcase
-
-Adopted from GIT repository to fix unittesting of 0.14.1
-
----
- Demos/embed/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Demos/embed/Makefile b/Demos/embed/Makefile
-index b43d08a..1112589 100644
---- a/Demos/embed/Makefile
-+++ b/Demos/embed/Makefile
-@@ -5,7 +5,7 @@ PYVERSION=$(shell $(PYTHON) -c "import sys; print(sys.version[:3])")
- INCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc())")
- LIBDIR1=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
- LIBDIR2=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBPL'))")
--STATIC_PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY'))")
-+PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY')[3:-2])")
-
- CC=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('CC'))")
- LINKCC=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LINKCC'))")
-@@ -14,7 +14,7 @@ LIBS=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig
- SYSLIBS= $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SYSLIBS'))")
-
- embedded: embedded.o
-- $(LINKCC) -o $@ $^ $(LIBDIR1)/$(STATIC_PYLIB) $(LINKFORSHARED) -L$(LIBDIR1) -L$(LIBDIR2) $(LIBS) $(SYSLIBS)
-+ $(LINKCC) -o $@ $^ -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB) $(LIBS) $(SYSLIBS) $(LINKFORSHARED)
-
- embedded.o: embedded.c
- $(CC) -c $^ -I$(INCDIR)
---
-1.7.2.3
-
Deleted: packages/cython/trunk/debian/patches/0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,46 +0,0 @@
-From 2651a5d4a6f990898217be97161d0b884fdf6f8f Mon Sep 17 00:00:00 2001
-From: Lisandro Dalcin <dalcinl at gmail.com>
-Date: Fri, 18 Feb 2011 16:11:11 -0300
-Subject: [PATCH] fix testcases assuming char is signed (thanks to Yaroslav Halchenko)
-
----
- tests/run/c_int_types_T255.pyx | 4 ++--
- tests/run/dictintindex.pyx | 5 ++++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/tests/run/c_int_types_T255.pyx b/tests/run/c_int_types_T255.pyx
-index 23220d5..82ca0e5 100644
---- a/tests/run/c_int_types_T255.pyx
-+++ b/tests/run/c_int_types_T255.pyx
-@@ -93,10 +93,10 @@ def test_char(char x):
- Traceback (most recent call last):
- ...
- OverflowError: ...
-+ >>> if CHAR_MIN < 0:
-+ ... assert test_char(-1) == -1
- >>> test_char(CHAR_MIN) == CHAR_MIN
- True
-- >>> test_char(-1)
-- -1
- >>> test_char(0)
- 0
- >>> test_char(1)
-diff --git a/tests/run/dictintindex.pyx b/tests/run/dictintindex.pyx
-index 2a83ac9..9e60f0d 100644
---- a/tests/run/dictintindex.pyx
-+++ b/tests/run/dictintindex.pyx
-@@ -4,7 +4,10 @@ def test_get_char_neg():
- 0
- """
- cdef char key = -1
-- d = {-1:0}
-+ if <char>-1 < 0:
-+ d = {-1:0}
-+ else:
-+ d = {255:0}
- return d[key]
- def test_get_char_zero():
- """
---
-1.7.2.3
-
Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series 2011-09-14 17:44:44 UTC (rev 7551)
+++ packages/cython/trunk/debian/patches/series 2011-09-14 22:51:18 UTC (rev 7552)
@@ -1,6 +1 @@
-0001-fix-makefile-for-embed-testcase.patch
-0001-fix-inline-textcase-to-not-use-default-HOME-.cython-.patch
-0001-fix-testcases-assuming-char-is-signed-thanks-to-Yaro.patch
-0001-additional-fix-and-test-for-ticket-650.patch
-0001-Python-3-fix-NumPy-support.patch
deb_tempdisable_numpy_doctests
More information about the Python-apps-commits
mailing list