diff options
author | Mark Wiebe <mwiebe@enthought.com> | 2011-06-07 16:50:18 -0500 |
---|---|---|
committer | Mark Wiebe <mwiebe@enthought.com> | 2011-06-07 16:50:18 -0500 |
commit | f986fd453ff26d6ea69384deb0cb21de04ef2ad8 (patch) | |
tree | 2a7adcf7094a24530eaa3ca60954abee214208b7 | |
parent | a8274369fcbc3332067a8555782cb40cc4684c83 (diff) | |
download | numpy-f986fd453ff26d6ea69384deb0cb21de04ef2ad8.tar.gz |
BLD: Fix build in single-file build mode
-rw-r--r-- | numpy/core/src/multiarray/_datetime.h | 7 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime.c | 37 | ||||
-rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 4 |
3 files changed, 2 insertions, 46 deletions
diff --git a/numpy/core/src/multiarray/_datetime.h b/numpy/core/src/multiarray/_datetime.h index a91953787..519a1c545 100644 --- a/numpy/core/src/multiarray/_datetime.h +++ b/numpy/core/src/multiarray/_datetime.h @@ -63,13 +63,6 @@ NPY_NO_EXPORT PyArray_Descr * parse_dtype_from_datetime_typestr(char *typestr, Py_ssize_t len); /* - * Creates a new NPY_TIMEDELTA dtype, copying the datetime metadata - * from the given dtype. - */ -NPY_NO_EXPORT PyArray_Descr * -timedelta_dtype_with_copied_meta(PyArray_Descr *dtype); - -/* * Converts a substring given by 'str' and 'len' into * a date time unit enum value. The 'metastr' parameter * is used for error messages, and may be NULL. diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c index b84a14fde..a1fcd54fa 100644 --- a/numpy/core/src/multiarray/datetime.c +++ b/numpy/core/src/multiarray/datetime.c @@ -1274,43 +1274,6 @@ parse_dtype_from_datetime_typestr(char *typestr, Py_ssize_t len) return dtype; } -/* - * Creates a new NPY_TIMEDELTA dtype, copying the datetime metadata - * from the given dtype. - */ -NPY_NO_EXPORT PyArray_Descr * -timedelta_dtype_with_copied_meta(PyArray_Descr *dtype) -{ - PyArray_Descr *ret; - PyObject *metacobj; - - ret = PyArray_DescrNewFromType(NPY_TIMEDELTA); - if (ret == NULL) { - return NULL; - } - Py_XDECREF(ret->metadata); - ret->metadata = PyDict_New(); - if (ret->metadata == NULL) { - Py_DECREF(ret); - return NULL; - } - - metacobj = get_datetime_metacobj_from_dtype(dtype); - if (metacobj == NULL) { - Py_DECREF(ret); - return NULL; - } - - if (PyDict_SetItemString(ret->metadata, NPY_METADATA_DTSTR, - metacobj) < 0) { - Py_DECREF(metacobj); - Py_DECREF(ret); - return NULL; - } - - return ret; -} - static NPY_DATETIMEUNIT _multiples_table[16][4] = { {12, 52, 365}, /* NPY_FR_Y */ {NPY_FR_M, NPY_FR_W, NPY_FR_D}, diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 2fea9d28d..c024dcccc 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -687,7 +687,7 @@ datetimetype_str(PyObject *self) return PyUString_FromString(iso); } -static char *_datetime_strings[] = { +static char *_datetime_verbose_strings[] = { "years", "months", "weeks", @@ -722,7 +722,7 @@ timedeltatype_str(PyObject *self) /* TODO: Account for events, etc */ if (scal->obmeta.base >= 0 && scal->obmeta.base < NPY_DATETIME_NUMUNITS) { - basestr = _datetime_strings[scal->obmeta.base]; + basestr = _datetime_verbose_strings[scal->obmeta.base]; } else { PyErr_SetString(PyExc_RuntimeError, |