[Python-apps-commits] r9328 - in packages/cython/trunk/debian (8 files)
yoh at users.alioth.debian.org
yoh at users.alioth.debian.org
Mon Dec 24 16:03:29 UTC 2012
Date: Monday, December 24, 2012 @ 16:03:26
Author: yoh
Revision: 9328
changelog for .3 + dropping all patches (upstreamed)
Modified:
packages/cython/trunk/debian/changelog
packages/cython/trunk/debian/patches/series
Deleted:
packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
packages/cython/trunk/debian/patches/0001-keep-longness-when-folding-negative-integer-constant.patch
packages/cython/trunk/debian/patches/0003-Fix-compiler-crash.patch
packages/cython/trunk/debian/patches/0005-fix-cimport-cython-in-string-code-fragments.patch
packages/cython/trunk/debian/patches/0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch
packages/cython/trunk/debian/patches/fix-ma-includes.patch
Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/changelog 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,3 +1,10 @@
+cython (0.17.3-1) experimental; urgency=low
+
+ * Bugfix upstream release:
+ - upstream includes all previously shipped patches
+
+ -- Yaroslav Halchenko <debian at onerussian.com> Thu, 20 Dec 2012 12:34:19 -0500
+
cython (0.17.2-1+bnd1) UNRELEASED; urgency=low
* debian/patches/squeeze-dsc-patch for a non-official backport build for
Deleted: packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,25 +0,0 @@
-From af9cfeb5f94d9cd4f2989fc8e111c33208494ba4 Mon Sep 17 00:00:00 2001
-From: Yaroslav Halchenko <debian at onerussian.com>
-Date: Wed, 5 Dec 2012 11:51:18 -0500
-Subject: [PATCH] fix analysis of entry to be a weakref (typo introduced in
- d96dfd)
-
-Originally reported in Debian http://bugs.debian.org/cgi-bin/bugreport.cgi\?bug\=692313
-Lead to crash with python-dbg:
-
- python-dbg: ../Modules/gcmodule.c:366: visit_decref: Assertion 'gc->gc.gc_refs != 0' failed
----
- Cython/Compiler/Symtab.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Cython/Compiler/Symtab.py
-+++ b/Cython/Compiler/Symtab.py
-@@ -801,7 +801,7 @@ class Scope(object):
-
- for entry in self.var_entries:
- if entry.type.is_pyobject:
-- if include_weakref or entry.name != "weakref":
-+ if include_weakref or entry.name != "__weakref__":
- py_attrs.append(entry)
- elif entry.type == PyrexTypes.c_py_buffer_type:
- py_buffers.append(entry)
Deleted: packages/cython/trunk/debian/patches/0001-keep-longness-when-folding-negative-integer-constant.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-keep-longness-when-folding-negative-integer-constant.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/0001-keep-longness-when-folding-negative-integer-constant.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,72 +0,0 @@
-From a89bf8567d2c54f38a5a3f4f8b8f9208db936d64 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml at behnel.de>
-Date: Tue, 27 Nov 2012 07:37:32 +0100
-Subject: [PATCH 1/6] keep longness when folding negative integer constants
-
---HG--
-extra : transplant_source : %CC%EC%23%19%11%1A%22%FB%5C-%18%AD%0D%FC%24L%BD%81%91%FF
----
- Cython/Compiler/ExprNodes.py | 3 ++-
- tests/run/int_literals.pyx | 18 +++++++++++++++++-
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
-index 13fc0ef..06fc30d 100755
---- a/Cython/Compiler/ExprNodes.py
-+++ b/Cython/Compiler/ExprNodes.py
-@@ -7290,7 +7290,8 @@ def unop_node(pos, operator, operand):
- # Construct unnop node of appropriate class for
- # given operator.
- if isinstance(operand, IntNode) and operator == '-':
-- return IntNode(pos = operand.pos, value = str(-Utils.str_to_number(operand.value)))
-+ return IntNode(pos = operand.pos, value = str(-Utils.str_to_number(operand.value)),
-+ longness=operand.longness, unsigned=operand.unsigned)
- elif isinstance(operand, UnopNode) and operand.operator == operator in '+-':
- warning(pos, "Python has no increment/decrement operator: %s%sx == %s(%sx) == x" % ((operator,)*4), 5)
- return unop_node_classes[operator](pos,
-diff --git a/tests/run/int_literals.pyx b/tests/run/int_literals.pyx
-index edc14af..770b60a 100644
---- a/tests/run/int_literals.pyx
-+++ b/tests/run/int_literals.pyx
-@@ -1,6 +1,8 @@
- __doc__ = u"""
- >>> c_longs()
- (1, 1L, -1L, 18446744073709551615L)
-+>>> negative_c_longs()
-+(-1, -9223285636854775809L)
- >>> py_longs()
- (1, 1L, 100000000000000000000000000000000L, -100000000000000000000000000000000L)
-
-@@ -18,14 +20,28 @@ import sys
- if sys.version_info[0] >= 3:
- __doc__ = __doc__.replace(u'L', u'')
-
-+ at cython.test_assert_path_exists(
-+ '//IntNode[@longness = "LL"]',
-+ '//IntNode[@longness = "L"]',
-+ )
-+ at cython.test_fail_if_path_exists('//IntNode[@longness = ""]')
- def c_longs():
- cdef long a = 1L
- cdef unsigned long ua = 1UL
- cdef long long aa = 0xFFFFFFFFFFFFFFFFLL
- cdef unsigned long long uaa = 0xFFFFFFFFFFFFFFFFULL
--
- return a, ua, aa, uaa
-
-+ at cython.test_assert_path_exists(
-+ '//IntNode[@longness = "LL"]',
-+ '//IntNode[@longness = "L"]',
-+ )
-+ at cython.test_fail_if_path_exists('//IntNode[@longness = ""]')
-+def negative_c_longs():
-+ cdef long a = -1L
-+ cdef long long aa = -9223285636854775809LL
-+ return a, aa
-+
- def py_longs():
- return 1, 1L, 100000000000000000000000000000000, -100000000000000000000000000000000
-
---
-1.8.0
-
Deleted: packages/cython/trunk/debian/patches/0003-Fix-compiler-crash.patch
===================================================================
--- packages/cython/trunk/debian/patches/0003-Fix-compiler-crash.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/0003-Fix-compiler-crash.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,25 +0,0 @@
-From c08ac4ed4a8f149d7cae86eb4b862bbb57a4b905 Mon Sep 17 00:00:00 2001
-From: Robert Bradshaw <robertwb at gmail.com>
-Date: Mon, 26 Nov 2012 23:54:50 -0800
-Subject: [PATCH 3/6] Fix compiler crash.
-
----
- Cython/Compiler/Nodes.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
-index c4f9f0b..6ba0e12 100644
---- a/Cython/Compiler/Nodes.py
-+++ b/Cython/Compiler/Nodes.py
-@@ -828,7 +828,7 @@ class CSimpleBaseTypeNode(CBaseTypeNode):
- scope = env
- for item in self.module_path:
- entry = scope.lookup(item)
-- if entry.is_cpp_class:
-+ if entry is not None and entry.is_cpp_class:
- scope = entry.type.scope
- else:
- scope = None
---
-1.8.0
-
Deleted: packages/cython/trunk/debian/patches/0005-fix-cimport-cython-in-string-code-fragments.patch
===================================================================
--- packages/cython/trunk/debian/patches/0005-fix-cimport-cython-in-string-code-fragments.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/0005-fix-cimport-cython-in-string-code-fragments.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,25 +0,0 @@
-From 37724cccf7258445d4d5b710519fbf4bcc2df7dc Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml at behnel.de>
-Date: Wed, 28 Nov 2012 21:15:28 +0100
-Subject: [PATCH 5/6] fix 'cimport cython' in string code fragments
-
----
- Cython/Compiler/TreeFragment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cython/Compiler/TreeFragment.py b/Cython/Compiler/TreeFragment.py
-index 29ff12d..9832959 100644
---- a/Cython/Compiler/TreeFragment.py
-+++ b/Cython/Compiler/TreeFragment.py
-@@ -26,7 +26,7 @@ class StringParseContext(Main.Context):
- self.module_name = name
-
- def find_module(self, module_name, relative_to = None, pos = None, need_pxd = 1):
-- if module_name != self.module_name:
-+ if module_name not in (self.module_name, 'cython'):
- raise AssertionError("Not yet supporting any cimports/includes from string code snippets")
- return ModuleScope(module_name, parent_module = None, context = self)
-
---
-1.8.0
-
Deleted: packages/cython/trunk/debian/patches/0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch
===================================================================
--- packages/cython/trunk/debian/patches/0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,46 +0,0 @@
-From 5827f4c9bcfe6b9030358727c1ca3197425e576e Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml at behnel.de>
-Date: Fri, 30 Nov 2012 13:30:31 +0100
-Subject: [PATCH 6/6] fix refnanny code for del statement inside of generators
-
----
- Cython/Compiler/ExprNodes.py | 2 ++
- tests/run/generators_py.py | 12 ++++++++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
-index 06fc30d..df4bff7 100755
---- a/Cython/Compiler/ExprNodes.py
-+++ b/Cython/Compiler/ExprNodes.py
-@@ -1861,6 +1861,8 @@ class NameNode(AtomicExprNode):
- code.put_error_if_unbound(self.pos, self.entry)
-
- if self.entry.type.is_pyobject:
-+ if self.entry.in_closure:
-+ code.put_gotref(self.result()) # generator
- code.put_decref(self.result(), self.ctype())
- code.putln('%s = NULL;' % self.result())
- else:
-diff --git a/tests/run/generators_py.py b/tests/run/generators_py.py
-index f044eb1..3159d52 100644
---- a/tests/run/generators_py.py
-+++ b/tests/run/generators_py.py
-@@ -350,3 +350,15 @@ def test_generator_cleanup():
- yield 1
- finally:
- print('cleanup')
-+
-+def test_del_in_generator():
-+ """
-+ >>> [ s for s in test_del_in_generator() ]
-+ ['abcabcabc', 'abcabcabc']
-+ """
-+ x = len('abc') * 'abc'
-+ a = x
-+ yield x
-+ del x
-+ yield a
-+ del a
---
-1.8.0
-
Deleted: packages/cython/trunk/debian/patches/fix-ma-includes.patch
===================================================================
--- packages/cython/trunk/debian/patches/fix-ma-includes.patch 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/fix-ma-includes.patch 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,22 +0,0 @@
-Description: python3 puts some stuff into multiarch paths
- an alternative would be to use $(PYTHON)-config --includes
-Author: Julian Taylor <jtaylor at ubuntu.com>
---- a/Demos/embed/Makefile
-+++ b/Demos/embed/Makefile
-@@ -3,6 +3,7 @@
- PYVERSION=$(shell $(PYTHON) -c "import sys; print(sys.version[:3])")
-
- INCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc())")
-+PLATINCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc(plat_specific=True))")
- 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'))")
- PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY')[3:-2])")
-@@ -17,7 +18,7 @@
- $(LINKCC) -o $@ $^ -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB) $(LIBS) $(SYSLIBS) $(LINKFORSHARED)
-
- embedded.o: embedded.c
-- $(CC) -c $^ -I$(INCDIR)
-+ $(CC) -c $^ -I$(INCDIR) -I$(PLATINCDIR)
-
- CYTHON=../../cython.py
- embedded.c: embedded.pyx
Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series 2012-12-24 16:03:07 UTC (rev 9327)
+++ packages/cython/trunk/debian/patches/series 2012-12-24 16:03:26 UTC (rev 9328)
@@ -1,6 +0,0 @@
-0001-keep-longness-when-folding-negative-integer-constant.patch
-0003-Fix-compiler-crash.patch
-0005-fix-cimport-cython-in-string-code-fragments.patch
-0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch
-0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
-fix-ma-includes.patch
More information about the Python-apps-commits
mailing list