]> granicus.if.org Git - python/commitdiff
Issue #14368: _PyTime_gettimeofday() cannot fail
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 26 Mar 2012 20:08:02 +0000 (22:08 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 26 Mar 2012 20:08:02 +0000 (22:08 +0200)
floattime() must not raise an error if the current time is 1970.1.1 at 00:00.

Modules/timemodule.c

index e6e1ff400ef9aeef269679b6937828bf8f3572c3..1d84db1d9d0a7f137cbb7e1ba624a144cf8beb05 100644 (file)
@@ -1063,14 +1063,8 @@ static PyObject*
 floattime(void)
 {
     _PyTime_timeval t;
-    double secs;
     _PyTime_gettimeofday(&t);
-    secs = (double)t.tv_sec + t.tv_usec*0.000001;
-    if (secs == 0.0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    return PyFloat_FromDouble(secs);
+    return PyFloat_FromDouble((double)t.tv_sec + t.tv_usec * 1e-6);
 }