numpy · mwiebe · Sep 8, 2011 · Sep 8, 2011 · Sep 8, 2011 · Sep 17, 2011
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2009, NumPy Developers.
+Copyright (c) 2005-2011, NumPy Developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py
@@ -287,6 +287,7 @@ def english_upper(s):
           TD(intfltcmplx),
           [TypeDescription('m', FullTypeDescr, 'mq', 'm'),
            TypeDescription('m', FullTypeDescr, 'md', 'm'),
+           #TypeDescription('m', FullTypeDescr, 'mm', 'd'),
           ],
           TD(O, f='PyNumber_FloorDivide'),
           ),
@@ -299,6 +300,7 @@ def english_upper(s):
           TD(flts+cmplx),
           [TypeDescription('m', FullTypeDescr, 'mq', 'm'),
            TypeDescription('m', FullTypeDescr, 'md', 'm'),
+           TypeDescription('m', FullTypeDescr, 'mm', 'd'),
           ],
           TD(O, f='PyNumber_TrueDivide'),
           ),

diff --git a/numpy/core/include/numpy/npy_3kcompat.h b/numpy/core/include/numpy/npy_3kcompat.h
@@ -15,7 +15,7 @@
 
 #if PY_VERSION_HEX >= 0x03000000
 #ifndef NPY_PY3K
-#define NPY_PY3K
+#define NPY_PY3K 1
 #endif
 #endif
 

diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
@@ -209,15 +209,9 @@ PyArray_CopyObject(PyArrayObject *dest, PyObject *src_object)
 
             /* If there's one dest element and src is a Python scalar */
             if (PyArray_IsScalar(src_object, Generic)) {
-                PyArray_Descr *dtype;
                 char *value;
                 int retcode;
 
-                dtype = PyArray_DescrFromScalar(src_object);
-                if (dtype == NULL) {
-                    Py_DECREF(src_object);
-                    return -1;
-                }
                 value = scalar_value(src_object, dtype);
                 if (value == NULL) {
                     Py_DECREF(dtype);
@@ -235,6 +229,7 @@ PyArray_CopyObject(PyArrayObject *dest, PyObject *src_object)
             /* Assigning NA affects the mask if it exists */
             else if (na != NULL) {
                 if (PyArray_AssignNA(dest, na, NULL, 0, NULL) < 0) {
+                    Py_DECREF(dtype);
                     Py_DECREF(na);
                     Py_DECREF(src_object);
                     return -1;

diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
@@ -663,7 +663,6 @@ VOID_getitem(char *ip, PyArrayObject *ap)
      */
     {
         intp dims[1], strides[1];
-        PyArray_Descr *descr;
         dims[0] = itemsize;
         strides[0] = 1;
         descr = PyArray_DescrNewFromType(NPY_BYTE);
@@ -672,7 +671,7 @@ VOID_getitem(char *ip, PyArrayObject *ap)
                              PyArray_ISWRITEABLE(ap) ? NPY_ARRAY_WRITEABLE : 0,
                              NULL);
         Py_INCREF(ap);
-        if (PyArray_SetBaseObject(u, ap) < 0) {
+        if (PyArray_SetBaseObject(u, (PyObject *)ap) < 0) {
             Py_DECREF(u);
             return NULL;
         }

diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c
@@ -21,6 +21,7 @@
 
 /* removed multiple segment interface */
 
+#if !defined(NPY_PY3K)
 static Py_ssize_t
 array_getsegcount(PyArrayObject *self, Py_ssize_t *lenp)
 {
@@ -72,6 +73,7 @@ array_getcharbuf(PyArrayObject *self, Py_ssize_t segment, constchar **ptrptr)
 {
     return array_getreadbuf(self, segment, (void **) ptrptr);
 }
+#endif /* !defined(NPY_PY3K) */
 
 
 /*************************************************************************

diff --git a/numpy/core/src/multiarray/calculation.c b/numpy/core/src/multiarray/calculation.c
@@ -42,8 +42,8 @@ PyArray_ArgMax(PyArrayObject *op, int axis, PyArrayObject *out)
     PyArrayObject *ap = NULL, *rp = NULL;
     PyArray_ArgFunc* arg_func;
     char *ip;
-    intp *rptr;
-    intp i, n, m;
+    npy_intp *rptr;
+    npy_intp i, n, m;
     int elsize;
     NPY_BEGIN_THREADS_DEF;
 
@@ -56,13 +56,13 @@ PyArray_ArgMax(PyArrayObject *op, int axis, PyArrayObject *out)
      */
     if (axis != PyArray_NDIM(ap)-1) {
         PyArray_Dims newaxes;
-        intp dims[MAX_DIMS];
-        int i;
+        npy_intp dims[MAX_DIMS];
+        int j;
 
         newaxes.ptr = dims;
         newaxes.len = PyArray_NDIM(ap);
-        for (i = 0; i < axis; i++) dims[i] = i;
-        for (i = axis; i < PyArray_NDIM(ap) - 1; i++) dims[i] = i + 1;
+        for (j = 0; j < axis; j++) dims[j] = j;
+        for (j = axis; j < PyArray_NDIM(ap) - 1; j++) dims[j] = j + 1;
         dims[PyArray_NDIM(ap) - 1] = axis;
         op = (PyArrayObject *)PyArray_Transpose(ap, &newaxes);
         Py_DECREF(ap);
@@ -120,7 +120,7 @@ PyArray_ArgMax(PyArrayObject *op, int axis, PyArrayObject *out)
 
     NPY_BEGIN_THREADS_DESCR(PyArray_DESCR(ap));
     n = PyArray_SIZE(ap)/m;
-    rptr = (intp *)PyArray_DATA(rp);
+    rptr = (npy_intp *)PyArray_DATA(rp);
     for (ip = PyArray_DATA(ap), i = 0; i < n; i++, ip += elsize*m) {
         arg_func(ip, m, rptr, ap);
         rptr += 1;
@@ -273,7 +273,7 @@ __New_PyArray_Std(PyArrayObject *self, int axis, int rtype, PyArrayObject *out,
     PyArrayObject *arr1 = NULL, *arr2 = NULL, *arrnew = NULL;
     PyObject *ret = NULL, *newshape = NULL;
     int i, n;
-    intp val;
+    npy_intp val;
 
     arrnew = (PyArrayObject *)PyArray_CheckAxis(self, &axis, NPY_ARRAY_ALLOWNA);
     if (arrnew == NULL) {

diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c
@@ -44,6 +44,7 @@ _array_find_python_scalar_type(PyObject *op)
     return NULL;
 }
 
+#if !defined(NPY_PY3K)
 static PyArray_Descr *
 _use_default_type(PyObject *op)
 {
@@ -65,6 +66,7 @@ _use_default_type(PyObject *op)
     }
     return PyArray_DescrFromType(typenum);
 }
+#endif
 
 /*
  * Recursively examines the object to determine an appropriate dtype

diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c
@@ -247,8 +247,8 @@ PyArray_ToFile(PyArrayObject *self, FILE *fp, char *sep, char *format)
 NPY_NO_EXPORT PyObject *
 PyArray_ToString(PyArrayObject *self, NPY_ORDER order)
 {
-    intp numbytes;
-    intp index;
+    npy_intp numbytes;
+    npy_intp i;
     char *dptr;
     int elsize;
     PyObject *ret;
@@ -293,9 +293,9 @@ PyArray_ToString(PyArrayObject *self, NPY_ORDER order)
             return NULL;
         }
         dptr = PyBytes_AS_STRING(ret);
-        index = it->size;
+        i = it->size;
         elsize = PyArray_DESCR(self)->elsize;
-        while (index--) {
+        while (i--) {
             memcpy(dptr, it->dataptr, elsize);
             dptr += elsize;
             PyArray_ITER_NEXT(it);

diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
@@ -1929,7 +1929,7 @@ convert_datetime_metadata_to_tuple(PyArray_DatetimeMetaData *meta)
     }
 
     PyTuple_SET_ITEM(dt_tuple, 0,
-            PyBytes_FromString(_datetime_strings[meta->base]));
+            PyUString_FromString(_datetime_strings[meta->base]));
     PyTuple_SET_ITEM(dt_tuple, 1,
             PyInt_FromLong(meta->num));
 
@@ -1948,6 +1948,7 @@ convert_datetime_metadata_tuple_to_datetime_metadata(PyObject *tuple,
     char *basestr = NULL;
     Py_ssize_t len = 0, tuple_size;
     int den = 1;
+    PyObject *unit_str = NULL;
 
     if (!PyTuple_Check(tuple)) {
         PyObject_Print(tuple, stderr, 0);
@@ -1965,16 +1966,30 @@ convert_datetime_metadata_tuple_to_datetime_metadata(PyObject *tuple,
         return -1;
     }
 
-    if (PyBytes_AsStringAndSize(PyTuple_GET_ITEM(tuple, 0),
-                                        &basestr, &len) < 0) {
+    unit_str = PyTuple_GET_ITEM(tuple, 0);
+    Py_INCREF(unit_str);
+    if (PyUnicode_Check(unit_str)) {
+        /* Allow unicode format strings: convert to bytes */
+        PyObject *tmp = PyUnicode_AsASCIIString(unit_str);
+        Py_DECREF(unit_str);
+        if (tmp == NULL) {
+            return -1;
+        }
+        unit_str = tmp;
+    }
+    if (PyBytes_AsStringAndSize(unit_str, &basestr, &len) < 0) {
+        Py_DECREF(unit_str);
         return -1;
     }
 
     out_meta->base = parse_datetime_unit_from_string(basestr, len, NULL);
     if (out_meta->base == -1) {
+        Py_DECREF(unit_str);
         return -1;
     }
 
+    Py_DECREF(unit_str);
+
     /* Convert the values to longs */
     out_meta->num = PyInt_AsLong(PyTuple_GET_ITEM(tuple, 1));
     if (out_meta->num == -1 && PyErr_Occurred()) {
@@ -2441,7 +2456,7 @@ convert_pydatetime_to_datetimestruct(PyObject *obj, npy_datetimestruct *out,
  * the Python datetime.tzinfo object.
  */
 NPY_NO_EXPORT int
-get_tzoffset_from_pytzinfo(PyObject *timezone, npy_datetimestruct *dts)
+get_tzoffset_from_pytzinfo(PyObject *timezone_obj, npy_datetimestruct *dts)
 {
     PyObject *dt, *loc_dt;
     npy_datetimestruct loc_dts;
@@ -2454,7 +2469,7 @@ get_tzoffset_from_pytzinfo(PyObject *timezone, npy_datetimestruct *dts)
     }
 
     /* Convert the datetime from UTC to local time */
-    loc_dt = PyObject_CallMethod(timezone, "fromutc", "O", dt);
+    loc_dt = PyObject_CallMethod(timezone_obj, "fromutc", "O", dt);
     Py_DECREF(dt);
     if (loc_dt == NULL) {
         return -1;

diff --git a/numpy/core/src/multiarray/datetime_busdaycal.c b/numpy/core/src/multiarray/datetime_busdaycal.c
@@ -206,8 +206,8 @@ PyArray_WeekMaskConverter(PyObject *weekmask_in, npy_bool *weekmask)
 static int
 qsort_datetime_compare(const void *elem1, const void *elem2)
 {
-    npy_datetime e1 = *(npy_datetime *)elem1;
-    npy_datetime e2 = *(npy_datetime *)elem2;
+    npy_datetime e1 = *(const npy_datetime *)elem1;
+    npy_datetime e2 = *(const npy_datetime *)elem2;
 
     return (e1 < e2) ? -1 : (e1 == e2) ? 0 : 1;
 }