From fa09beb1508f782b51ba0a2815c07e0294f40e95 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 30 Mar 2015 21:36:10 +0200
Subject: [PATCH] Issue #23485: Add _PyTime_FromMillisecondsObject() function

---
 Include/pytime.h |  8 +++++++-
 Python/pytime.c  | 23 ++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Include/pytime.h b/Include/pytime.h
index 1f14d6d4beb..bf237c8655b 100644
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -69,12 +69,18 @@ PyAPI_FUNC(int) _PyTime_ObjectToTimespec(
 /* Create a timestamp from a number of nanoseconds (C long). */
 PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(PY_LONG_LONG ns);
 
-/* Convert a Python float or int to a timetamp.
+/* Convert a number of seconds (Python float or int) to a timetamp.
    Raise an exception and return -1 on error, return 0 on success. */
 PyAPI_FUNC(int) _PyTime_FromSecondsObject(_PyTime_t *t,
     PyObject *obj,
     _PyTime_round_t round);
 
+/* Convert a number of milliseconds (Python float or int, 10^-3) to a timetamp.
+   Raise an exception and return -1 on error, return 0 on success. */
+PyAPI_FUNC(int) _PyTime_FromMillisecondsObject(_PyTime_t *t,
+    PyObject *obj,
+    _PyTime_round_t round);
+
 /* Convert a timestamp to a number of seconds as a C double. */
 PyAPI_FUNC(double) _PyTime_AsSecondsDouble(_PyTime_t t);
 
diff --git a/Python/pytime.c b/Python/pytime.c
index 5bf8c568e7b..003003bdcab 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -203,8 +203,9 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise)
 }
 #endif
 
-int
-_PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
+static int
+_PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round,
+                   long to_nanoseconds)
 {
     if (PyFloat_Check(obj)) {
         /* volatile avoids unsafe optimization on float enabled by gcc -O3 */
@@ -212,7 +213,7 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
 
         /* convert to a number of nanoseconds */
         d = PyFloat_AsDouble(obj);
-        d *= 1e9;
+        d *= to_nanoseconds;
 
         if (round == _PyTime_ROUND_CEILING)
             d = ceil(d);
@@ -242,8 +243,8 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
                 _PyTime_overflow();
             return -1;
         }
-        *t = sec * SEC_TO_NS;
-        if (*t / SEC_TO_NS != sec) {
+        *t = sec * to_nanoseconds;
+        if (*t / to_nanoseconds != sec) {
             _PyTime_overflow();
             return -1;
         }
@@ -251,6 +252,18 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
     }
 }
 
+int
+_PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
+{
+    return _PyTime_FromObject(t, obj, round, SEC_TO_NS);
+}
+
+int
+_PyTime_FromMillisecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
+{
+    return _PyTime_FromObject(t, obj, round, MS_TO_NS);
+}
+
 double
 _PyTime_AsSecondsDouble(_PyTime_t t)
 {