Merge lp:~barry/ubuntu/natty/python-numpy/685469-crash into lp:ubuntu/natty/python-numpy

[Barry Warsaw]

python-numpy (1:1.4.1-5ubuntu4) natty; urgency=low

  * Fix pymvpa crash caused by numpy incompatibility with Python 2.7.
    This is a back port of the numpy upstream changeset:
    http://projects.scipy.org/numpy/changeset/8394
    (LP: #685469)

 -- Barry Warsaw <email address hidden> Thu, 16 Dec 2010 15:57:29 -0500

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-11 01:02:18 +0000
+++ debian/changelog	2010-12-16 22:22:13 +0000
@@ -1,3 +1,12 @@
+python-numpy (1:1.4.1-5ubuntu4) natty; urgency=low
+
+  * Fix pymvpa crash caused by numpy incompatibility with Python 2.7.
+    This is a back port of the numpy upstream changeset:
+    http://projects.scipy.org/numpy/changeset/8394
+    (LP: #685469)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 16 Dec 2010 15:57:29 -0500
+
 python-numpy (1:1.4.1-5ubuntu3) natty; urgency=low
 
   * Rebuild with python2.7 as the default python version.

=== added file 'debian/patches/changeset_r8394.diff'
--- debian/patches/changeset_r8394.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/changeset_r8394.diff	2010-12-16 22:22:13 +0000
@@ -0,0 +1,66 @@
+--- a/numpy/core/src/multiarray/numpyos.c
++++ b/numpy/core/src/multiarray/numpyos.c
+@@ -418,6 +418,32 @@
+     return 0;
+ }
+ 
++/*
++ * _NumPyOS_ascii_strtod_plain:
++ * 
++ * PyOS_ascii_strtod work-alike, with no enhanced features,
++ * for forward compatibility with Python >= 2.7
++ */
++static double
++NumPyOS_ascii_strtod_plain(const char *s, char** endptr)
++{
++    double result;
++#if PY_VERSION_HEX >= 0x02070000
++    NPY_ALLOW_C_API_DEF
++    NPY_ALLOW_C_API
++    result = PyOS_string_to_double(s, endptr, NULL);
++    if (PyErr_Occurred()) {
++        if (endptr) {
++            *endptr = (char*)s;
++        }
++        PyErr_Clear();
++    }
++    NPY_DISABLE_C_API
++#else
++    result = PyOS_ascii_strtod(s, endptr);
++#endif
++    return result;
++}
+ 
+ /*
+  * NumPyOS_ascii_strtod:
+@@ -506,7 +532,7 @@
+             }
+             memcpy(buffer, s, n);
+             buffer[n] = '\0';
+-            result = PyOS_ascii_strtod(buffer, &q);
++            result = NumPyOS_ascii_strtod_plain(buffer, &q);
+             if (endptr != NULL) {
+                 *endptr = (char*)(s + (q - buffer));
+             }
+@@ -515,7 +541,7 @@
+     }
+     /* End of ##2 */
+ 
+-    return PyOS_ascii_strtod(s, endptr);
++    return NumPyOS_ascii_strtod_plain(s, endptr);
+ }
+ 
+ 
+--- a/numpy/core/tests/test_regression.py
++++ b/numpy/core/tests/test_regression.py
+@@ -1235,6 +1235,10 @@
+         assert_(np.isfinite(np.log1p(np.exp2(-53))))
+ 
+ 
++    def test_fromstring_crash(self):
++        # Ticket #1345: the following should not cause a crash
++        np.fromstring(asbytes('aa, aa, 1.0'), sep=',')
++
+ if __name__ == "__main__":
+     run_module_suite()
+     def test_duplicate_title_and_name(self):

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-07 10:19:13 +0000
+++ debian/patches/series	2010-12-16 22:22:13 +0000
@@ -8,3 +8,4 @@
 changeset_r8511.diff
 changeset_r8526.diff
 changeset_r8364.diff
+changeset_r8394.diff