Fix to get rid of the problem with result_type. Pending upstream appr…

…oval or suggestion of an alternative.
sagemath · Nov 8, 2015 · ebdf899 · ebdf899
1 parent de8f740
commit ebdf899
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch b/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch
@@ -0,0 +1,15 @@
+diff -Naur numpy-1.10.1.orig/numpy/core/function_base.py numpy-1.10.1/numpy/core/function_base.py
+--- numpy-1.10.1.orig/numpy/core/function_base.py	2015-11-09 10:40:25.078701111 +1300
++++ numpy-1.10.1/numpy/core/function_base.py	2015-11-09 10:41:36.858716491 +1300
+@@ -87,8 +87,9 @@
+     div = (num - 1) if endpoint else num
+
+     # Convert float/complex array scalars to float, gh-3504
+-    start = start * 1.
+-    stop = stop * 1.
++    from numpy import asarray
++    start = asarray(start) * 1.
++    stop = asarray(stop) * 1.
+
+     dt = result_type(start, stop, float(num))
+     if dtype is None: