Merge pull request numpy#276 from charris/fix-format-variable-mismatch

BUG: Fix format/variable incompatibility.
brsr · May 10, 2012 · 65fdf09 · 65fdf09
2 parents bfaaefe + 7939c20
commit 65fdf09
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
@@ -2084,7 +2084,6 @@ arraydescr_new(PyTypeObject *NPY_UNUSED(subtype),
 static PyObject *
 _get_pickleabletype_from_datetime_metadata(PyArray_Descr *dtype)
 {
-    PyObject *newdict;
     PyObject *ret, *dt_tuple;
     PyArray_DatetimeMetaData *meta;
 
@@ -3324,7 +3323,7 @@ descr_repeat(PyObject *self, Py_ssize_t length)
     PyArray_Descr *new;
     if (length < 0) {
         return PyErr_Format(PyExc_ValueError,
-                "Array length must be >= 0, not %"NPY_INTP_FMT, length);
+                "Array length must be >= 0, not %"NPY_INTP_FMT, (npy_intp)length);
     }
     tup = Py_BuildValue("O" NPY_SSIZE_T_PYFMT, self, length);
     if (tup == NULL) {