summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2012-05-10 02:11:14 -0600
committerCharles Harris <charlesr.harris@gmail.com>2012-05-10 02:11:14 -0600
commit7939c20c9c3fd2129de12d77400ae6bae2a50d20 (patch)
treef29b869d7a656033b5b35421fc0da91a890df556 /numpy/core
parentbb162a291b765a34a2e6fab845c36f34c01357af (diff)
downloadnumpy-7939c20c9c3fd2129de12d77400ae6bae2a50d20.tar.gz
BUG: Fix format/variable incompatibility.
This shows up in python 2.4 where Py_ssize_t is an int. Also remove unused variable.
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/src/multiarray/descriptor.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index 2095ef2ab..d8def3988 100644
--- 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) {