Fix up oldnumeric.py functions to return intput class where possible. Allow complex-valued arrays in PyArray_Round. Add backward-compatible support for Python2.5 ssize_t changes.

3 files changed, 121 insertions, 33 deletions

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 98ce359ae..3b57c22c6 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -1331,7 +1331,7 @@ array_dealloc(PyArrayObject *self) {
  ****************   Implement Mapping Protocol ***************************
  *************************************************************************/
 
-static int
+static _int_or_ssize_t
 array_length(PyArrayObject *self)
 {
         if (self->nd != 0) {
@@ -1371,12 +1371,11 @@ array_big_item(PyArrayObject *self, intp i)
 }
 
 static PyObject *
-array_item_nice(PyArrayObject *self, int i)
+array_item_nice(PyArrayObject *self, _int_or_ssize_t i)
 {
 	return PyArray_Return((PyArrayObject *)array_big_item(self, (intp) i));
 }
 
-
 static int
 array_ass_big_item(PyArrayObject *self, intp i, PyObject *v)
 {
@@ -1415,11 +1414,18 @@ array_ass_big_item(PyArrayObject *self, intp i, PyObject *v)
         return 0;
 }
 
-#if SIZEOF_INT == SIZEOF_INTP
-#define array_ass_item array_ass_big_item
+#if PY_VERSION_HEX < 0x02050000
+ #if SIZEOF_INT == SIZEOF_INTP
+ #define array_ass_item array_ass_big_item
+ #endif
 #else
+ #if SIZEOF_SIZE_T == SIZEOF_INTP
+ #define array_ass_item array_ass_big_item
+ #endif
+#endif
+#ifndef array_ass_item
 static int
-array_ass_item(PyArrayObject *self, int i, PyObject *v)
+array_ass_item(PyArrayObject *self, _int_or_ssize_t i, PyObject *v)
 {
 	return array_ass_big_item(self, (intp) i, v);
 }
@@ -2257,7 +2263,11 @@ array_subscript_nice(PyArrayObject *self, PyObject *op)
 
 
 static PyMappingMethods array_as_mapping = {
+#if PY_VERSION_HEX >= 0x02050000
+        (lenfunc)array_length,		    /*mp_length*/
+#else
         (inquiry)array_length,		    /*mp_length*/
+#endif
         (binaryfunc)array_subscript_nice,	/*mp_subscript*/
         (objobjargproc)array_ass_sub,	    /*mp_ass_subscript*/
 };
@@ -2271,8 +2281,8 @@ static PyMappingMethods array_as_mapping = {
 
 /* removed multiple segment interface */
 
-static int
-array_getsegcount(PyArrayObject *self, int *lenp)
+static _int_or_ssize_t
+array_getsegcount(PyArrayObject *self, _int_or_ssize_t *lenp)
 {
         if (lenp)
                 *lenp = PyArray_NBYTES(self);
@@ -2286,8 +2296,8 @@ array_getsegcount(PyArrayObject *self, int *lenp)
         return 0;
 }
 
-static int
-array_getreadbuf(PyArrayObject *self, int segment, void **ptrptr)
+static _int_or_ssize_t
+array_getreadbuf(PyArrayObject *self, _int_or_ssize_t segment, void **ptrptr)
 {
         if (segment != 0) {
                 PyErr_SetString(PyExc_ValueError,
@@ -2305,8 +2315,8 @@ array_getreadbuf(PyArrayObject *self, int segment, void **ptrptr)
 }
 
 
-static int
-array_getwritebuf(PyArrayObject *self, int segment, void **ptrptr)
+static _int_or_ssize_t
+array_getwritebuf(PyArrayObject *self, _int_or_ssize_t segment, void **ptrptr)
 {
         if (PyArray_CHKFLAGS(self, WRITEABLE))
                 return array_getreadbuf(self, segment, (void **) ptrptr);
@@ -2317,8 +2327,8 @@ array_getwritebuf(PyArrayObject *self, int segment, void **ptrptr)
         }
 }
 
-static int
-array_getcharbuf(PyArrayObject *self, int segment, const char **ptrptr)
+static _int_or_ssize_t
+array_getcharbuf(PyArrayObject *self, _int_or_ssize_t segment, const char **ptrptr)
 {
         if (self->descr->type_num == PyArray_STRING || \
 	    self->descr->type_num == PyArray_UNICODE)
@@ -2332,10 +2342,17 @@ array_getcharbuf(PyArrayObject *self, int segment, const char **ptrptr)
 }
 
 static PyBufferProcs array_as_buffer = {
+#if PY_VERSION_HEX >= 0x02050000
+        (readbufferproc)array_getreadbuf,    /*bf_getreadbuffer*/
+        (writebufferproc)array_getwritebuf,  /*bf_getwritebuffer*/
+        (segcountproc)array_getsegcount,	    /*bf_getsegcount*/
+        (charbufferproc)array_getcharbuf,    /*bf_getcharbuffer*/
+#else
         (getreadbufferproc)array_getreadbuf,    /*bf_getreadbuffer*/
         (getwritebufferproc)array_getwritebuf,  /*bf_getwritebuffer*/
         (getsegcountproc)array_getsegcount,	    /*bf_getsegcount*/
         (getcharbufferproc)array_getcharbuf,    /*bf_getcharbuffer*/
+#endif
 };
 
 /****************** End of Buffer Protocol *******************************/
@@ -3187,18 +3204,30 @@ array_contains(PyArrayObject *self, PyObject *el)
         return ret;
 }
 
-
 static PySequenceMethods array_as_sequence = {
+#if PY_VERSION_HEX >= 0x02050000
+        (lenfunc)array_length,		/*sq_length*/
+        (binaryfunc)NULL, /* sq_concat is handled by nb_add*/
+        (ssizeargfunc)NULL,
+	(ssizeargfunc)array_item_nice,
+	(ssizessizeargfunc)array_slice,
+        (ssizeobjargproc)array_ass_item,	       /*sq_ass_item*/
+        (ssizessizeobjargproc)array_ass_slice,	/*sq_ass_slice*/
+	(objobjproc) array_contains,           /* sq_contains */
+	(binaryfunc) NULL,                  /* sg_inplace_concat */
+	(ssizeargfunc)NULL,
+#else
         (inquiry)array_length,		/*sq_length*/
         (binaryfunc)NULL, /* sq_concat is handled by nb_add*/
         (intargfunc)NULL, /* sq_repeat is handled nb_multiply*/
         (intargfunc)array_item_nice,		/*sq_item*/
         (intintargfunc)array_slice,		/*sq_slice*/
-        (intobjargproc)array_ass_item,	/*sq_ass_item*/
+        (intobjargproc)array_ass_item,	       /*sq_ass_item*/
         (intintobjargproc)array_ass_slice,	/*sq_ass_slice*/
 	(objobjproc) array_contains,           /* sq_contains */
-	(binaryfunc) NULL,         /* sg_inplace_concat */
+	(binaryfunc) NULL,                  /* sg_inplace_concat */
 	(intargfunc) NULL         /* sg_inplace_repeat */
+#endif
 };
 
 
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
index d55987959..0d6f2e4b4 100644
--- a/numpy/core/src/multiarraymodule.c
+++ b/numpy/core/src/multiarraymodule.c
@@ -216,6 +216,39 @@ power_of_ten(int n)
 static PyObject *
 PyArray_Round(PyArrayObject *a, int decimals)
 {
+	if (PyArray_ISCOMPLEX(a)) {
+		PyObject *part;
+		PyObject *round_part;
+		PyObject *new;
+		int res;
+		new = PyArray_Copy(a);
+		if (new == NULL) return NULL;
+
+		/* new.real = a.real.round(decimals) */
+		part = PyObject_GetAttrString(new, "real");
+		if (part == NULL) {Py_DECREF(new); return NULL;}
+		round_part = PyArray_Round\
+			((PyArrayObject *)PyArray_EnsureAnyArray(part), 
+			 decimals);
+		Py_DECREF(part);
+		if (round_part == NULL) {Py_DECREF(new); return NULL;}
+		res = PyObject_SetAttrString(new, "real", round_part);
+		Py_DECREF(round_part);
+		if (res < 0) {Py_DECREF(new); return NULL;}
+
+		/* new.imag = a.imag.round(decimals) */
+		part = PyObject_GetAttrString(new, "imag");
+		if (part == NULL) {Py_DECREF(new); return NULL;}
+		round_part = PyArray_Round\
+			((PyArrayObject *)PyArray_EnsureAnyArray(part), 
+			 decimals);
+		Py_DECREF(part);
+		if (round_part == NULL) {Py_DECREF(new); return NULL;}
+		res = PyObject_SetAttrString(new, "imag", round_part);
+		Py_DECREF(round_part);
+		if (res < 0) {Py_DECREF(new); return NULL;}
+		return new;
+	}
 	/* do the most common case first */
 	if (decimals == 0) {
 		if (PyArray_ISINTEGER(a)) {
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src
index 4ede7e397..f8c474039 100644
--- a/numpy/core/src/scalartypes.inc.src
+++ b/numpy/core/src/scalartypes.inc.src
@@ -1879,20 +1879,20 @@ object_arrtype_setattro(PyObjectScalarObject *obj, PyObject *attr, PyObject *val
 	return PyObject_GenericSetAttr((PyObject *)obj, attr, val);
 }
 
-static int 
-object_arrtype_length(PyObjectScalarObject *self) 
-{
-	return PyObject_Length(self->obval);
-}
-
 static PyObject *
 object_arrtype_concat(PyObjectScalarObject *self, PyObject *other)
 {
 	return PySequence_Concat(self->obval, other);
 }
 
+static _int_or_ssize_t
+object_arrtype_length(PyObjectScalarObject *self) 
+{
+	return PyObject_Length(self->obval);
+}
+
 static PyObject *
-object_arrtype_repeat(PyObjectScalarObject *self, int count)
+object_arrtype_repeat(PyObjectScalarObject *self, _int_or_ssize_t count)
 {
 	return PySequence_Repeat(self->obval, count);
 }
@@ -1923,12 +1923,24 @@ object_arrtype_inplace_concat(PyObjectScalarObject *self, PyObject *o)
 }
 
 static PyObject *
-object_arrtype_inplace_repeat(PyObjectScalarObject *self, int count)
+object_arrtype_inplace_repeat(PyObjectScalarObject *self, _int_or_ssize_t count)
 {
 	return PySequence_InPlaceRepeat(self->obval, count);
 }
 
 static PySequenceMethods object_arrtype_as_sequence = {
+#if PY_VERSION_HEX >= 0x02050000
+        (lenfunc)object_arrtype_length, /*sq_length*/
+        (binaryfunc)object_arrtype_concat, /*sq_concat*/
+        (ssizeargfunc)object_arrtype_repeat, /*sq_repeat*/
+        0,                                  /*sq_item*/
+        0,                                  /*sq_slice*/
+        0,                                   /* sq_ass_item */
+        0,                                   /* sq_ass_slice */
+        (objobjproc)object_arrtype_contains,              /* sq_contains */
+        (binaryfunc)object_arrtype_inplace_concat,        /* sq_inplace_concat */
+        (ssizeargfunc)object_arrtype_inplace_repeat,        /* sq_inplace_repeat */
+#else
         (inquiry)object_arrtype_length, /*sq_length*/
         (binaryfunc)object_arrtype_concat, /*sq_concat*/
         (intargfunc)object_arrtype_repeat, /*sq_repeat*/
@@ -1939,16 +1951,23 @@ static PySequenceMethods object_arrtype_as_sequence = {
         (objobjproc)object_arrtype_contains,              /* sq_contains */
         (binaryfunc)object_arrtype_inplace_concat,        /* sq_inplace_concat */
         (intargfunc)object_arrtype_inplace_repeat,        /* sq_inplace_repeat */
+#endif
 };
 
 static PyMappingMethods object_arrtype_as_mapping = {
+#if PY_VERSION_HEX >= 0x02050000
+        (lenfunc)object_arrtype_length,
+        (binaryfunc)object_arrtype_subscript,
+        (objobjargproc)object_arrtype_ass_subscript,
+#else
         (inquiry)object_arrtype_length,
         (binaryfunc)object_arrtype_subscript,
         (objobjargproc)object_arrtype_ass_subscript,
+#endif
 };
 
-static int 
-object_arrtype_getsegcount(PyObjectScalarObject *self, int *lenp) 
+static _int_or_ssize_t
+object_arrtype_getsegcount(PyObjectScalarObject *self, _int_or_ssize_t *lenp) 
 {
 	int newlen;
 	int cnt;
@@ -1965,8 +1984,8 @@ object_arrtype_getsegcount(PyObjectScalarObject *self, int *lenp)
 	return cnt;
 }
 
-static int 
-object_arrtype_getreadbuf(PyObjectScalarObject *self, int segment, void **ptrptr) 
+static _int_or_ssize_t
+object_arrtype_getreadbuf(PyObjectScalarObject *self, _int_or_ssize_t segment, void **ptrptr) 
 {
 	PyBufferProcs *pb = self->obval->ob_type->tp_as_buffer;
 
@@ -1981,8 +2000,8 @@ object_arrtype_getreadbuf(PyObjectScalarObject *self, int segment, void **ptrptr
 	return (*pb->bf_getreadbuffer)(self->obval, segment, ptrptr);
 }
 
-static int 
-object_arrtype_getwritebuf(PyObjectScalarObject *self, int segment, void **ptrptr) 
+static _int_or_ssize_t
+object_arrtype_getwritebuf(PyObjectScalarObject *self, _int_or_ssize_t segment, void **ptrptr) 
 {
 	PyBufferProcs *pb = self->obval->ob_type->tp_as_buffer;
 
@@ -1997,8 +2016,8 @@ object_arrtype_getwritebuf(PyObjectScalarObject *self, int segment, void **ptrpt
 	return (*pb->bf_getwritebuffer)(self->obval, segment, ptrptr);
 }
 
-static int 
-object_arrtype_getcharbuf(PyObjectScalarObject *self, int segment, 
+static _int_or_ssize_t 
+object_arrtype_getcharbuf(PyObjectScalarObject *self, _int_or_ssize_t segment, 
 			  const char **ptrptr) 
 {
 	PyBufferProcs *pb = self->obval->ob_type->tp_as_buffer;
@@ -2015,10 +2034,17 @@ object_arrtype_getcharbuf(PyObjectScalarObject *self, int segment,
 }
 
 static PyBufferProcs object_arrtype_as_buffer = {
+#if PY_VERSION_HEX >= 0x02050000
+        (readbufferproc)object_arrtype_getreadbuf,
+        (writebufferproc)object_arrtype_getwritebuf,
+        (segcountproc)object_arrtype_getsegcount,
+        (charbufferproc)object_arrtype_getcharbuf,
+#else
         (getreadbufferproc)object_arrtype_getreadbuf,
         (getwritebufferproc)object_arrtype_getwritebuf,
         (getsegcountproc)object_arrtype_getsegcount,
         (getcharbufferproc)object_arrtype_getcharbuf,
+#endif
 };
 
 static PyObject *