diff options
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/SConscript | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime.c | 6 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime_busdaycal.c | 1 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime_strings.c | 5 | ||||
-rw-r--r-- | numpy/core/src/multiarray/dtype_transfer.c | 1 |
5 files changed, 5 insertions, 10 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 178c7de37..5bf62ea11 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -165,7 +165,7 @@ if config.CheckDeclaration(('PRIdPTR'), includes = '#include <inttypes.h>'): numpyconfig_sym.append(('DEFINE_NPY_USE_C99_FORMATS', '#define NPY_USE_C99_FORMATS 1')) else: numpyconfig_sym.append(('DEFINE_NPY_USE_C99_FORMATS', '')) - + #---------------------- # Checking the mathlib #---------------------- diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c index 66d695fed..7a0bafbf2 100644 --- a/numpy/core/src/multiarray/datetime.c +++ b/numpy/core/src/multiarray/datetime.c @@ -435,7 +435,7 @@ convert_datetime_to_datetimestruct(PyArray_DatetimeMetaData *meta, "with generic units"); return -1; } - + /* TODO: Change to a mechanism that avoids the potential overflow */ dt *= meta->num; @@ -1844,7 +1844,7 @@ datetime_type_promotion(PyArray_Descr *type1, PyArray_Descr *type2) return NULL; } Py_DECREF(gcdmeta); - + return dtype; @@ -2895,7 +2895,7 @@ convert_pyobject_to_timedelta(PyArray_DatetimeMetaData *meta, PyObject *obj, else { /* Switch back to microseconds for the casting operation */ us_meta.base = NPY_FR_us; - + return cast_timedelta_to_timedelta(&us_meta, meta, td, out); } } diff --git a/numpy/core/src/multiarray/datetime_busdaycal.c b/numpy/core/src/multiarray/datetime_busdaycal.c index d45fd0921..ae35212ea 100644 --- a/numpy/core/src/multiarray/datetime_busdaycal.c +++ b/numpy/core/src/multiarray/datetime_busdaycal.c @@ -539,4 +539,3 @@ NPY_NO_EXPORT PyTypeObject NpyBusDayCalendar_Type = { 0, /* tp_version_tag */ #endif }; - diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c index c25b9abc6..423528b72 100644 --- a/numpy/core/src/multiarray/datetime_strings.c +++ b/numpy/core/src/multiarray/datetime_strings.c @@ -77,7 +77,7 @@ parse_iso_8601_datetime(char *str, int len, memset(out, 0, sizeof(npy_datetimestruct)); out->month = 1; out->day = 1; - + /* * Convert the empty string and case-variants of "NaT" to not-a-time. * Tried to use PyOS_stricmp, but that function appears to be broken, @@ -1517,6 +1517,3 @@ fail: return NULL; } - - - diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c index 123505d75..7609f0016 100644 --- a/numpy/core/src/multiarray/dtype_transfer.c +++ b/numpy/core/src/multiarray/dtype_transfer.c @@ -3649,4 +3649,3 @@ PyArray_CastRawArrays(npy_intp count, /* If needs_api was set to 1, it may have raised a Python exception */ return (needs_api && PyErr_Occurred()) ? NPY_FAIL : NPY_SUCCEED; } - |