Merge branch 'Xmader/perf/convert-date-by-timestamp' into Xmader/fix/readline-windows

Author: Xmader

src/DateType.cc

@@ -12,6 +12,8 @@
 DateType::DateType(PyObject *object) : PyType(object) {}
 
 DateType::DateType(JSContext *cx, JS::HandleObject dateObj) {
+  if (!PyDateTimeAPI) { PyDateTime_IMPORT; } // for PyDateTime_FromTimestamp
+
   JS::Rooted<JS::ValueArray<0>> args(cx);
   JS::Rooted<JS::Value> year(cx);
   JS::Rooted<JS::Value> month(cx);
@@ -20,19 +22,23 @@ DateType::DateType(JSContext *cx, JS::HandleObject dateObj) {
   JS::Rooted<JS::Value> minute(cx);
   JS::Rooted<JS::Value> second(cx);
   JS::Rooted<JS::Value> usecond(cx);
-  JS_CallFunctionName(cx, dateObj, "getFullYear", args, &year);
-  JS_CallFunctionName(cx, dateObj, "getMonth", args, &month);
-  JS_CallFunctionName(cx, dateObj, "getDate", args, &day);
-  JS_CallFunctionName(cx, dateObj, "getHours", args, &hour);
-  JS_CallFunctionName(cx, dateObj, "getMinutes", args, &minute);
-  JS_CallFunctionName(cx, dateObj, "getSeconds", args, &second);
-  JS_CallFunctionName(cx, dateObj, "getMilliseconds", args, &usecond);
-
-  PyDateTime_IMPORT;
-  pyObject = PyDateTime_FromDateAndTime(
+  JS_CallFunctionName(cx, dateObj, "getUTCFullYear", args, &year);
+  JS_CallFunctionName(cx, dateObj, "getUTCMonth", args, &month);
+  JS_CallFunctionName(cx, dateObj, "getUTCDate", args, &day);
+  JS_CallFunctionName(cx, dateObj, "getUTCHours", args, &hour);
+  JS_CallFunctionName(cx, dateObj, "getUTCMinutes", args, &minute);
+  JS_CallFunctionName(cx, dateObj, "getUTCSeconds", args, &second);
+  JS_CallFunctionName(cx, dateObj, "getUTCMilliseconds", args, &usecond);
+
+  pyObject = PyDateTimeAPI->DateTime_FromDateAndTime(
     year.toNumber(), month.toNumber() + 1, day.toNumber(),
     hour.toNumber(), minute.toNumber(), second.toNumber(),
-    usecond.toNumber() * 1000);
+    usecond.toNumber() * 1000,
+    PyDateTime_TimeZone_UTC, // Make the resulting Python datetime object timezone-aware
+                             // See https://docs.python.org/3/library/datetime.html#aware-and-naive-objects
+    PyDateTimeAPI->DateTimeType
+  );
+  Py_INCREF(PyDateTime_TimeZone_UTC);
 }
 
 JSObject *DateType::toJsDate(JSContext *cx) {

src/jsTypeFactory.cc

@@ -67,7 +67,7 @@ size_t UCS4ToUTF16(const uint32_t *chars, size_t length, uint16_t **outStr) {
 }
 
 JS::Value jsTypeFactory(JSContext *cx, PyObject *object) {
-  PyDateTime_IMPORT; // for PyDateTime_Check
+  if (!PyDateTimeAPI) { PyDateTime_IMPORT; } // for PyDateTime_Check
 
   JS::RootedValue returnType(cx);
 

src/modules/pythonmonkey/pythonmonkey.cc

@@ -391,7 +391,7 @@ static JSFunctionSpec jsGlobalFunctions[] = {
 
 PyMODINIT_FUNC PyInit_pythonmonkey(void)
 {
-  PyDateTime_IMPORT;
+  if (!PyDateTimeAPI) { PyDateTime_IMPORT; }
 
   SpiderMonkeyError = PyErr_NewException("pythonmonkey.SpiderMonkeyError", NULL, NULL);
   if (!JS_Init()) {

tests/js/js2py/datetime2.simple

@@ -52,7 +52,7 @@ def eq(date1, date2):
 def eqUnixTime(date, timet):
     import datetime
     global eq
-    return eq(date, datetime.datetime.utcfromtimestamp(timet))
+    return eq(date, datetime.datetime.fromtimestamp(timet, tz=datetime.timezone.utc))
 `);
 
 const eq = python.eval('eq');

tests/js/py2js/datetime.simple.failing renamed to tests/js/py2js/datetime.simple

@@ -10,6 +10,7 @@
 
 const throughJS = x => x;
 var expectedJsTimestamp;
+var actualJsTimestamp;
 var jsDate;
 var pyDate;
 
@@ -35,9 +36,10 @@ python.exec(`import datetime`);
 pyDate = python.eval(`datetime.datetime.fromtimestamp(${expectedJsTimestamp}, tz=timezone.utc)`);
 jsDate = throughJS(pyDate);
 
-if (jsDate.getTime() !== expectedJsTimestamp)
+actualJsTimestamp = jsDate.getTime() / 1000; // JS timestamp is in milliseconds, convert it to seconds
+if (actualJsTimestamp !== expectedJsTimestamp)
 {
-  console.error('expected', expectedJsTimestamp, 'but got',jsDate.getTime());
+  console.error('expected', expectedJsTimestamp, 'but got', actualJsTimestamp);
   throw new Error('test failed');
 }
 

tests/python/test_pythonmonkey_eval.py

@@ -1,7 +1,7 @@
 import pytest
 import pythonmonkey as pm
 import random
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import math
 
 def test_passes():
@@ -47,7 +47,7 @@ def test_eval_booleans():
 def test_eval_dates():
     MIN_YEAR = 1 # https://docs.python.org/3/library/datetime.html#datetime.MINYEAR
     MAX_YEAR = 2023
-    start = datetime(MIN_YEAR, 1, 1, 00, 00, 00)
+    start = datetime(MIN_YEAR, 1, 1, 00, 00, 00, tzinfo=timezone.utc)
     years = MAX_YEAR - MIN_YEAR + 1
     end = start + timedelta(days=365 * years)
     for _ in range(10):