diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 21:05:36 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 21:05:36 +0000 |
| commit | 490712cd35dcecfc9423de4bde0b29cb012dda25 (patch) | |
| tree | 56b6ccaac48afc370a189c596d5e9e90ac0254d4 /numpy/core/src | |
| parent | 7ff852162596a8eaa02ef87730474285b080d594 (diff) | |
| download | numpy-490712cd35dcecfc9423de4bde0b29cb012dda25.tar.gz | |
More numpy fixes...
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/arraytypes.inc.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 8 | ||||
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src index 322eafef8..773ffb320 100644 --- a/numpy/core/src/arraytypes.inc.src +++ b/numpy/core/src/arraytypes.inc.src @@ -1892,7 +1892,7 @@ set_typeinfo(PyObject *dict) (PyObject *)&Py##name##ArrType_Type); SETTYPE(Generic) - SETTYPE(Numeric) + SETTYPE(Number) SETTYPE(Integer) SETTYPE(Inexact) SETTYPE(SignedInteger) diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 6c993b069..7f6ceb8a9 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -5288,9 +5288,9 @@ setup_scalartypes(PyObject *dict) if (PyType_Ready(&PyGenericArrType_Type) < 0) return -1; - SINGLE_INHERIT(Numeric, Generic); - SINGLE_INHERIT(Integer, Numeric); - SINGLE_INHERIT(Inexact, Numeric); + SINGLE_INHERIT(Number, Generic); + SINGLE_INHERIT(Integer, Number); + SINGLE_INHERIT(Inexact, Number); SINGLE_INHERIT(SignedInteger, Integer); SINGLE_INHERIT(UnsignedInteger, Integer); SINGLE_INHERIT(Floating, Inexact); @@ -5493,7 +5493,7 @@ DL_EXPORT(void) initmultiarray(void) { if (set_typeinfo(d) != 0) goto err; _numpy_internal = \ - PyImport_ImportModule("numpy.base._internal"); + PyImport_ImportModule("numpy.core._internal"); if (_numpy_internal != NULL) return; err: diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 972b2424f..4d3c4cd28 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -19,9 +19,9 @@ typedef struct { /**begin repeat -#name=numeric, integer, signedinteger, unsignedinteger, inexact, floating, complexfloating, flexible, +#name=number, integer, signedinteger, unsignedinteger, inexact, floating, complexfloating, flexible, character# -#NAME=Numeric, Integer, SignedInteger, UnsignedInteger, Inexact, Floating, ComplexFloating, Flexible, Character# +#NAME=Number, Integer, SignedInteger, UnsignedInteger, Inexact, Floating, ComplexFloating, Flexible, Character# */ static PyTypeObject Py@NAME@ArrType_Type = { @@ -1925,7 +1925,7 @@ initialize_numeric_types(void) PyVoidArrType_Type.tp_as_mapping = &voidtype_as_mapping; /**begin repeat -#NAME=Numeric, Integer, SignedInteger, UnsignedInteger, Inexact, Floating, +#NAME=Number, Integer, SignedInteger, UnsignedInteger, Inexact, Floating, ComplexFloating, Flexible, Character# */ Py@NAME@ArrType_Type.tp_flags = BASEFLAGS; @@ -2064,7 +2064,7 @@ PyArray_DescrFromTypeObject(PyObject *type) } /* Check the generic types */ - if ((type == (PyObject *) &PyNumericArrType_Type) || \ + if ((type == (PyObject *) &PyNumberArrType_Type) || \ (type == (PyObject *) &PyInexactArrType_Type) || \ (type == (PyObject *) &PyFloatingArrType_Type)) typenum = PyArray_DOUBLE; |