Skip to content

Commit

Permalink
STY: Cleanup trailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
charris committed Jul 7, 2011
1 parent c5c1a48 commit 1b2ca74
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion numpy/core/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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
#----------------------
Expand Down
6 changes: 3 additions & 3 deletions numpy/core/src/multiarray/datetime.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -1844,7 +1844,7 @@ datetime_type_promotion(PyArray_Descr *type1, PyArray_Descr *type2)
return NULL;
}
Py_DECREF(gcdmeta);

return dtype;


Expand Down Expand Up @@ -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);
}
}
Expand Down
1 change: 0 additions & 1 deletion numpy/core/src/multiarray/datetime_busdaycal.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,4 +539,3 @@ NPY_NO_EXPORT PyTypeObject NpyBusDayCalendar_Type = {
0, /* tp_version_tag */
#endif
};

5 changes: 1 addition & 4 deletions numpy/core/src/multiarray/datetime_strings.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -1517,6 +1517,3 @@ array_datetime_as_string(PyObject *NPY_UNUSED(self), PyObject *args,

return NULL;
}



1 change: 0 additions & 1 deletion numpy/core/src/multiarray/dtype_transfer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 1b2ca74

Please sign in to comment.