[Python-modules-commits] r13293 - in packages/scipy/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Monday, June 7, 2010 @ 12:51:28
  Author: dktrkranz
Revision: 13293

Do not use string exceptions, not supported by Python 2.6

Added:
  packages/scipy/trunk/debian/patches/string_exception.patch
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/patches/series

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2010-06-07 09:24:00 UTC (rev 13292)
+++ packages/scipy/trunk/debian/changelog	2010-06-07 12:51:28 UTC (rev 13293)
@@ -1,3 +1,10 @@
+python-scipy (0.7.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/string_exceptions.patch:
+    - Do not use string exceptions, not supported by Python 2.6.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 07 Jun 2010 12:50:15 +0000
+
 python-scipy (0.7.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2010-06-07 09:24:00 UTC (rev 13292)
+++ packages/scipy/trunk/debian/patches/series	2010-06-07 12:51:28 UTC (rev 13293)
@@ -1 +1,2 @@
 restore_sys_argv.patch
+string_exception.patch

Added: packages/scipy/trunk/debian/patches/string_exception.patch
===================================================================
--- packages/scipy/trunk/debian/patches/string_exception.patch	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/string_exception.patch	2010-06-07 12:51:28 UTC (rev 13293)
@@ -0,0 +1,29 @@
+Description: Do not use string exceptions, not supported by Python 2.6
+Origin: Debian
+
+Index: python-scipy-0.7.2/scipy/weave/blitz_tools.py
+===================================================================
+--- python-scipy-0.7.2.orig/scipy/weave/blitz_tools.py	2010-06-07 12:48:10.000000000 +0000
++++ python-scipy-0.7.2/scipy/weave/blitz_tools.py	2010-06-07 12:47:44.000000000 +0000
+@@ -32,7 +32,7 @@
+     #    of time.  It also can cause core-dumps if the sizes of the inputs
+     #    aren't compatible.
+     if check_size and not size_check.check_expr(expr,local_dict,global_dict):
+-        raise 'inputs failed to pass size check.'
++        raise Exception('inputs failed to pass size check.')
+ 
+     # 2. try local cache
+     try:
+Index: python-scipy-0.7.2/scipy/weave/bytecodecompiler.py
+===================================================================
+--- python-scipy-0.7.2.orig/scipy/weave/bytecodecompiler.py	2010-06-07 12:48:10.000000000 +0000
++++ python-scipy-0.7.2/scipy/weave/bytecodecompiler.py	2010-06-07 12:48:02.000000000 +0000
+@@ -237,7 +237,7 @@
+         elif goto is None:
+             return next # Normal
+         else:
+-            raise 'xx'
++            raise Exception('xx')
+ 
+     symbols = { 0: 'less', 1: 'lesseq', 2: 'equal', 3: 'notequal',
+                 4: 'greater', 5: 'greatereq', 6: 'in', 7: 'not in',