1 files changed, 0 insertions, 92 deletions
diff --git a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
deleted file mode 100644
index 072afbc0e..000000000
--- a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
-index 00c71f9..0afdc17 100644
---- a/numpy/core/src/multiarray/scalarapi.c
-+++ b/numpy/core/src/multiarray/scalarapi.c
-@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             itemsize = (((itemsize - 1) >> 2) + 1) << 2;
-         }
-     }
-+#if PY_VERSION_HEX >= 0x03030000
-+    if (type_num == NPY_UNICODE) {
-+        PyObject *u, *args;
-+        char *buffer;
-+        if (swap) {
-+            buffer = malloc(itemsize);
-+            if (buffer == NULL) {
-+                PyErr_NoMemory();
-+                return NULL;
-+            }
-+            memcpy(buffer, data, itemsize);
-+            byte_swap_vector(buffer, itemsize >> 2, 4);
-+        } else {
-+            buffer = data;
-+        }
-+        u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
-+                itemsize >> 2);
-+        if (swap) {
-+            free(buffer);
-+        }
-+        if (u == NULL) {
-+            return NULL;
-+        }
-+        args = Py_BuildValue("(O)", u);
-+        if (args == NULL) {
-+            Py_DECREF(u);
-+            return NULL;
-+        }
-+        obj = type->tp_new(type, args, NULL);
-+        Py_DECREF(u);
-+        Py_DECREF(args);
-+        return obj;
-+    }
-+#endif
-     if (type->tp_itemsize != 0) {
-         /* String type */
-         obj = type->tp_alloc(type, itemsize);
-@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             memcpy(destptr, data, itemsize);
-             return obj;
-         }
-+#if PY_VERSION_HEX < 0x03030000
-         else if (type_num == PyArray_UNICODE) {
-             /* tp_alloc inherited from Python PyBaseObject_Type */
-             PyUnicodeObject *uni = (PyUnicodeObject*)obj;
-@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- #endif
-             return obj;
-         }
-+#endif // PY_VERSION_HEX < 0x03030000
-         else {
-             PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
-             vobj->base = NULL;
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index e547071..12745d7 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -2592,7 +2592,11 @@ finish:
-     *((npy_@name@ *)dest) = *((npy_@name@ *)src);
- #elif @default@ == 1 /* unicode and strings */
-     if (itemsize == 0) { /* unicode */
-+#if PY_VERSION_HEX >= 0x03030000
-+        itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
-+#else
-         itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
-+#endif
-     }
-     memcpy(dest, src, itemsize);
-     /* @default@ == 2 won't get here */
-diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
-index c4147ef..119056c 100644
---- a/numpy/core/src/multiarray/methods.c
-+++ b/numpy/core/src/multiarray/methods.c
-@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
-     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
-         int swap=!PyArray_ISNOTSWAPPED(self);
-         self->data = datastr;
--        if (!_IsAligned(self) || swap) {
-+        if (!_IsAligned(self) || swap || (len <= 1000)) {
-             intp num = PyArray_NBYTES(self);
-             self->data = PyDataMem_NEW(num);
-             if (self->data == NULL) {
--- 
-1.7.12.3