[Python-modules-commits] r13730 - in packages/numpy/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, June 30, 2010 @ 16:36:00
  Author: morph
Revision: 13730

* debian/patches/07_bts585309_string_exceptions.diff
  - added upstream patch (r8463) to remove string exceptions; Closes: #585309

Added:
  packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2010-06-30 16:06:45 UTC (rev 13729)
+++ packages/numpy/trunk/debian/changelog	2010-06-30 16:36:00 UTC (rev 13730)
@@ -23,6 +23,8 @@
   * debian/python-numpy.install
     - sorted, it's clearer to read
     - added installation for 'compat', 'matrixlib' and 'polynomial' submodules
+  * debian/patches/07_bts585309_string_exceptions.diff
+    - added upstream patch (r8463) to remove string exceptions; Closes: #585309
 
   [ Piotr Ożarowski ]
   * debian/control: add XB-Python-Version to python-numpy-dbg package
@@ -42,7 +44,7 @@
   * Use setup.py install --install-layout; specifying --prefix installs
     into the wrong location.
 
- -- Sandro Tosi <morph at debian.org>  Tue, 29 Jun 2010 19:59:46 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 30 Jun 2010 17:49:19 +0200
 
 python-numpy (1:1.3.0-3) unstable; urgency=low
 

Added: packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff
===================================================================
--- packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/07_bts585309_string_exceptions.diff	2010-06-30 16:36:00 UTC (rev 13730)
@@ -0,0 +1,16 @@
+Description: Remove string exceptions
+
+Index: python-numpy-1.4.1/numpy/f2py/capi_maps.py
+===================================================================
+--- python-numpy-1.4.1.orig/numpy/f2py/capi_maps.py	2010-06-30 18:04:02.420160466 +0200
++++ python-numpy-1.4.1/numpy/f2py/capi_maps.py	2010-06-30 18:04:23.320158823 +0200
+@@ -429,7 +429,8 @@
+                 else:
+                     v = eval(v,{},{})
+                     ret['init.r'],ret['init.i']=str(v.real),str(v.imag)
+-            except: raise 'sign2map: expected complex number `(r,i)\' but got `%s\' as initial value of %s.'%(init,`a`)
++            except:
++                raise ValueError('sign2map: expected complex number `(r,i)\' but got `%s\' as initial value of %r.' % (init, a))
+             if isarray(var):
+                 init='(capi_c.r=%s,capi_c.i=%s,capi_c)'%(ret['init.r'],ret['init.i'])
+         elif isstring(var):

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2010-06-30 16:06:45 UTC (rev 13729)
+++ packages/numpy/trunk/debian/patches/series	2010-06-30 16:36:00 UTC (rev 13730)
@@ -2,3 +2,4 @@
 02_build_dotblas.patch
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
+07_bts585309_string_exceptions.diff