Fix oppia#9565: Pass .timetuple() to time.mktime() in utils.get_time_…

…in_millisecs (oppia#9560) * fix get_time_in_milliseconds * fix lint * simplify logic * simplify fix * consistent literals
brianlinUM · Jun 20, 2020 · 0565ec6 · 0565ec6
1 parent 0b9dafb
commit 0565ec6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/utils.py b/utils.py
@@ -414,8 +414,8 @@ def get_time_in_millisecs(datetime_obj):
     Returns:
         float. The time in milliseconds since the Epoch.
     """
-    seconds = time.mktime(datetime_obj.utctimetuple()) * 1000
-    return seconds + python_utils.divide(datetime_obj.microsecond, 1000.0)
+    msecs = time.mktime(datetime_obj.timetuple()) * 1000.0
+    return msecs + python_utils.divide(datetime_obj.microsecond, 1000.0)
 
 
 def get_current_time_in_millisecs():

diff --git a/utils_test.py b/utils_test.py
@@ -363,3 +363,17 @@ def test_require_valid_thumbnail_filename(self):
             'Expected a filename ending in svg, received name.jpg', 'name.jpg')
         filename = 'filename.svg'
         utils.require_valid_thumbnail_filename(filename)
+
+    def test_get_time_in_millisecs(self):
+        dt = datetime.datetime(2020, 6, 15)
+        msecs = utils.get_time_in_millisecs(dt)
+        self.assertEqual(
+            dt,
+            datetime.datetime.fromtimestamp(python_utils.divide(msecs, 1000.0)))
+
+    def test_get_time_in_millisecs_with_complicated_time(self):
+        dt = datetime.datetime(2020, 6, 15, 5, 18, 23, microsecond=123456)
+        msecs = utils.get_time_in_millisecs(dt)
+        self.assertEqual(
+            dt,
+            datetime.datetime.fromtimestamp(python_utils.divide(msecs, 1000.0)))