BUG: print format fix for datetime/timedelta

gandalf013 · charris · commit 730b86112009 · 2011-08-13T22:24:17.000-06:00
diff --git 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));
     }
