diff options
| author | Alok Singhal <gandalf013@gmail.com> | 2011-08-02 19:14:24 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-13 22:24:17 -0600 |
| commit | 730b861120094b1ab38670b9a8895a36c19296a7 (patch) | |
| tree | 4f28933474cf3db2b5ae1eda3bcb2ce1480b22f9 /numpy | |
| parent | 418f070fc67d1ea2b6eae3259e9dcf7a980bbaaf (diff) | |
| download | numpy-730b861120094b1ab38670b9a8895a36c19296a7.tar.gz | |
BUG: print format fix for datetime/timedelta
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index fc3a74fd2..3b761252b 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -681,8 +681,15 @@ timedeltatype_repr(PyObject *self) ret = PyUString_FromString("numpy.timedelta64('NaT'"); } else { + /* Can't use "%lld" in Python < 2.7, or if HAVE_LONG_LONG is not + * defined */ +#if defined(HAVE_LONG_LONG) && (PY_VERSION_HEX >= 0x02070000) ret = PyUString_FromFormat("numpy.timedelta64(%lld", (long long)scal->obval); +#else + ret = PyUString_FromFormat("numpy.timedelta64(%ld", + (long)scal->obval); +#endif } /* The metadata unit */ if (scal->obmeta.base == NPY_FR_GENERIC) { @@ -784,8 +791,15 @@ timedeltatype_str(PyObject *self) ret = PyUString_FromString("NaT"); } else { + /* Can't use "%lld" in Python < 2.7, or if HAVE_LONG_LONG is not + * defined */ +#if defined(HAVE_LONG_LONG) && (PY_VERSION_HEX >= 0x02070000) ret = PyUString_FromFormat("%lld ", (long long)(scal->obval * scal->obmeta.num)); +#else + ret = PyUString_FromFormat("%ld ", + (long)(scal->obval * scal->obmeta.num)); +#endif PyUString_ConcatAndDel(&ret, PyUString_FromString(basestr)); } |