diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:18:36 +0000 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:18:36 +0000 |
| commit | 7236ac1dd10a8faf0a10524de1d2950cebd04efe (patch) | |
| tree | aacb04872688755204768e20cec13af078a5ed86 /numpy/core | |
| parent | 9c77c439698e34656d21f5e13bdf12210f659735 (diff) | |
| download | numpy-7236ac1dd10a8faf0a10524de1d2950cebd04efe.tar.gz | |
3K: Some remaining Py_TYPE issues
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/blasdot/_dotblas.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/scalarmathmodule.c.src | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c index a6be8b084..a50ce224b 100644 --- a/numpy/core/blasdot/_dotblas.c +++ b/numpy/core/blasdot/_dotblas.c @@ -401,7 +401,7 @@ dotblas_matrixproduct(PyObject *NPY_UNUSED(dummy), PyObject *args) } /* Choose which subtype to return */ - if (Py_Type(ap1) != Py_Type(ap2)) { + if (Py_TYPE(ap1) != Py_TYPE(ap2)) { prior2 = PyArray_GetPriority((PyObject *)ap2, 0.0); prior1 = PyArray_GetPriority((PyObject *)ap1, 0.0); subtype = (prior2 > prior1 ? Py_TYPE(ap2) : Py_TYPE(ap1)); diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index 5e8cd812f..cfd3c0bc9 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -556,7 +556,7 @@ _@name@_convert_to_ctype(PyObject *a, @name@ *arg1) if (!PyArray_IsScalar(a, Number)) { return -1; } - descr1 = PyArray_DescrFromTypeObject((PyObject *)(a->ob_type)); + descr1 = PyArray_DescrFromTypeObject((PyObject *)Py_TYPE(a)); if (PyArray_CanCastSafely(descr1->type_num, PyArray_@NAME@)) { PyArray_CastScalarDirect(a, descr1, arg1, PyArray_@NAME@); Py_DECREF(descr1); |