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

[yoh at users.alioth.debian.org]

    Date: Monday, April 25, 2011 @ 00:37:49
  Author: yoh
Revision: 6961

CP from upstream: 0001-additional-fix-and-test-for-ticket-650.patch (Closes: #620859)

patch was refreshed to apply without offsets to 0.14.1

Added:
  packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch
Modified:
  packages/cython/trunk/debian/changelog
  packages/cython/trunk/debian/patches/series

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2011-04-22 21:15:34 UTC (rev 6960)
+++ packages/cython/trunk/debian/changelog	2011-04-25 00:37:49 UTC (rev 6961)
@@ -1,3 +1,10 @@
+cython (0.14.1-5) unstable; urgency=low
+
+  * Cherry-picked from upstream:
+    - 0001-additional-fix-and-test-for-ticket-650.patch (Closes: #620859)
+
+ -- Yaroslav Halchenko <debian at onerussian.com>  Wed, 06 Apr 2011 11:07:21 -0400
+
 cython (0.14.1-4) unstable; urgency=low
 
   * Cherry-picked from upstream:

Added: 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	                        (rev 0)
+++ packages/cython/trunk/debian/patches/0001-additional-fix-and-test-for-ticket-650.patch	2011-04-25 00:37:49 UTC (rev 6961)
@@ -0,0 +1,38 @@
+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")

Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series	2011-04-22 21:15:34 UTC (rev 6960)
+++ packages/cython/trunk/debian/patches/series	2011-04-25 00:37:49 UTC (rev 6961)
@@ -1,3 +1,4 @@
 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