Merge branch 'Xmader/feat/python-3.13-support' into Xmader/fix/fix-mem-bugs-using-debug-build

Author: Xmader

include/pyshim.hh

@@ -78,7 +78,7 @@ inline int _PyArg_CheckPositional(const char *name, Py_ssize_t nargs, Py_ssize_t
  *        Since Python 3.13, `_PyDictView_New` function became an internal API.
  * @see Modified from https://github.com/python/cpython/blob/v3.13.0rc1/Objects/dictobject.c#L5806-L5827
  */
-inline PyObject *PyDictViewObject_new(PyObject *dict, PyTypeObject *type) {
+inline PyObject *PyDictView_New(PyObject *dict, PyTypeObject *type) {
 #if PY_VERSION_HEX < 0x030d0000 // Python version is lower than 3.13
   return _PyDictView_New(dict, type);
 #else
@@ -107,4 +107,39 @@ inline void PyErr_SetKeyError(PyObject *key) {
 #endif
 }
 
+/**
+ * @brief Shim for `Py_SET_SIZE`.
+ *        `Py_SET_SIZE` is not available in Python < 3.9
+ */
+#ifndef Py_SET_SIZE
+static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) {
+  ob->ob_size = size;
+}
+#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject *)(ob), size)
+#endif
+
+/**
+ * @brief Shim for `PyObject_CallOneArg`.
+ *        `PyObject_CallOneArg` is not available in Python < 3.9
+ */
+#if PY_VERSION_HEX < 0x03090000 // Python version is less than 3.9
+inline PyObject *PyObject_CallOneArg(PyObject *func, PyObject *arg) {
+  return PyObject_CallFunction(func, "O", arg);
+}
+#endif
+
+/**
+ * @brief Shim for `_PyLong_AsByteArray`.
+ *        Python 3.13.0a4 added a new public API `PyLong_AsNativeBytes()` to replace the private `_PyLong_AsByteArray()`.
+ *        But this change also modified the function signature of `_PyLong_AsByteArray()`.
+ * @see https://github.com/python/cpython/issues/111140
+ */
+inline int PyLong_AsByteArray(PyLongObject *v, unsigned char *bytes, size_t n, bool little_endian, bool is_signed) {
+#if PY_VERSION_HEX >= 0x030d0000 // Python version is 3.13 or higher
+  return _PyLong_AsByteArray(v, bytes, n, little_endian, is_signed, /*with_exceptions*/ false);
+#else
+  return _PyLong_AsByteArray(v, bytes, n, little_endian, is_signed);
+#endif
+}
+
 #endif // #ifndef PythonMonkey_py_version_shim_

python/pythonmonkey/require.py

@@ -84,9 +84,8 @@
 globalThis.python.stderr.read = lambda n: sys.stderr.read(n)
 # Python 3.13 dramatically changed how the namespace in `exec`/`eval` works
 # See https://docs.python.org/3.13/whatsnew/3.13.html#defined-mutation-semantics-for-locals
-_locals = {}  # keep the local variables inside `eval`/`exec` to a dict
-globalThis.python.eval = lambda x: eval(str(x)[:], None, _locals)
-globalThis.python.exec = lambda x: exec(str(x)[:], None, _locals)
+globalThis.python.eval = lambda x: eval(str(x)[:], None, sys._getframe(1).f_locals)
+globalThis.python.exec = lambda x: exec(str(x)[:], None, sys._getframe(1).f_locals)
 globalThis.python.getenv = os.getenv
 globalThis.python.paths = sys.path
 

src/ExceptionType.cc

@@ -19,7 +19,9 @@
 #include <jsapi.h>
 #include <js/Exception.h>
 
+#include <Python.h>
 #include <frameobject.h>
+#include "include/pyshim.hh"
 
 
 PyObject *ExceptionType::getPyObject(JSContext *cx, JS::HandleObject error) {
@@ -29,11 +31,7 @@ PyObject *ExceptionType::getPyObject(JSContext *cx, JS::HandleObject error) {
   PyObject *errStr = getExceptionString(cx, JS::ExceptionStack(cx, errValue, errStack), true);
 
   // Construct a new SpiderMonkeyError python object
-  #if PY_VERSION_HEX >= 0x03090000
   PyObject *pyObject = PyObject_CallOneArg(SpiderMonkeyError, errStr); // _PyErr_CreateException, https://github.com/python/cpython/blob/3.9/Python/errors.c#L100
-  #else
-  PyObject *pyObject = PyObject_CallFunction(SpiderMonkeyError, "O", errStr); // PyObject_CallOneArg is not available in Python < 3.9
-  #endif
   Py_XDECREF(errStr);
 
   // Preserve the original JS Error object as the Python Exception's `jsError` attribute for lossless two-way conversion

src/IntType.cc

@@ -14,6 +14,9 @@
 #include <jsapi.h>
 #include <js/BigInt.h>
 
+#include <Python.h>
+#include "include/pyshim.hh"
+
 #include <vector>
 
 #define SIGN_BIT_MASK 0b1000 // https://hg.mozilla.org/releases/mozilla-esr102/file/tip/js/src/vm/BigIntType.h#l40
@@ -44,11 +47,7 @@ static inline void PythonLong_SetSign(PyLongObject *op, int sign) {
 #else // Python version is less than 3.12
   // see https://github.com/python/cpython/blob/v3.9.16/Objects/longobject.c#L956
   Py_ssize_t pyDigitCount = Py_SIZE(op);
-  #if PY_VERSION_HEX >= 0x03090000
   Py_SET_SIZE(op, sign * std::abs(pyDigitCount));
-  #else
-  ((PyVarObject *)op)->ob_size = sign * std::abs(pyDigitCount); // Py_SET_SIZE is not available in Python < 3.9
-  #endif
 #endif
 }
 
@@ -102,11 +101,7 @@ PyObject *IntType::getPyObject(JSContext *cx, JS::BigInt *bigint) {
   // Cast to a pythonmonkey.bigint to differentiate it from a normal Python int,
   //  allowing Py<->JS two-way BigInt conversion.
   // We don't do `Py_SET_TYPE` because `_PyLong_FromByteArray` may cache and reuse objects for small ints
-  #if PY_VERSION_HEX >= 0x03090000
   PyObject *pyObject = PyObject_CallOneArg(getPythonMonkeyBigInt(), pyIntObj); // pyObject = pythonmonkey.bigint(pyIntObj)
-  #else
-  PyObject *pyObject = PyObject_CallFunction(getPythonMonkeyBigInt(), "O", pyIntObj); // PyObject_CallOneArg is not available in Python < 3.9
-  #endif
   Py_DECREF(pyIntObj);
 
   // Set the sign bit
@@ -139,11 +134,7 @@ JS::BigInt *IntType::toJsBigInt(JSContext *cx, PyObject *pyObject) {
     // Convert to bytes of 8-bit "digits" in **big-endian** order
     size_t byteCount = (size_t)JS_DIGIT_BYTE * jsDigitCount;
     uint8_t *bytes = (uint8_t *)PyMem_Malloc(byteCount);
-    #if PY_VERSION_HEX >= 0x030d0000 // Python version is greater than 3.13
-    _PyLong_AsByteArray((PyLongObject *)pyObject, bytes, byteCount, /*is_little_endian*/ false, false, false);
-    #else
-    _PyLong_AsByteArray((PyLongObject *)pyObject, bytes, byteCount, /*is_little_endian*/ false, false);
-    #endif
+    PyLong_AsByteArray((PyLongObject *)pyObject, bytes, byteCount, /*is_little_endian*/ false, false);
 
     // Convert pm.bigint to JS::BigInt through hex strings (no public API to convert directly through bytes)
     // TODO (Tom Tang): We could manually allocate the memory, https://hg.mozilla.org/releases/mozilla-esr102/file/tip/js/src/vm/BigIntType.cpp#l162, but still no public API

src/JSObjectProxy.cc

@@ -782,13 +782,13 @@ PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_update_method(JSObjectPr
 }
 
 PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_keys_method(JSObjectProxy *self) {
-  return PyDictViewObject_new((PyObject *)self, &JSObjectKeysProxyType);
+  return PyDictView_New((PyObject *)self, &JSObjectKeysProxyType);
 }
 
 PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_values_method(JSObjectProxy *self) {
-  return PyDictViewObject_new((PyObject *)self, &JSObjectValuesProxyType);
+  return PyDictView_New((PyObject *)self, &JSObjectValuesProxyType);
 }
 
 PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_items_method(JSObjectProxy *self) {
-  return PyDictViewObject_new((PyObject *)self, &JSObjectItemsProxyType);
+  return PyDictView_New((PyObject *)self, &JSObjectItemsProxyType);
 }

src/PromiseType.cc

@@ -19,6 +19,9 @@
 #include <jsfriendapi.h>
 #include <js/Promise.h>
 
+#include <Python.h>
+#include "include/pyshim.hh"
+
 // slot ids to access the python object in JS callbacks
 #define PY_FUTURE_OBJ_SLOT 0
 #define PROMISE_OBJ_SLOT 1
@@ -38,11 +41,7 @@ static bool onResolvedCb(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (state == JS::PromiseState::Rejected && !PyExceptionInstance_Check(result)) {
     // Wrap the result object into a SpiderMonkeyError object
     // because only *Exception objects can be thrown in Python `raise` statement and alike
-    #if PY_VERSION_HEX >= 0x03090000
     PyObject *wrapped = PyObject_CallOneArg(SpiderMonkeyError, result); // wrapped = SpiderMonkeyError(result)
-    #else
-    PyObject *wrapped = PyObject_CallFunction(SpiderMonkeyError, "O", result); // PyObject_CallOneArg is not available in Python < 3.9
-    #endif
     // Preserve the original JS value as the `jsError` attribute for lossless conversion back
     PyObject *originalJsErrCapsule = DictType::getPyObject(cx, resultArg);
     PyObject_SetAttrString(wrapped, "jsError", originalJsErrCapsule);

src/jsTypeFactory.cc

@@ -394,11 +394,7 @@ bool callPyFunc(JSContext *cx, unsigned int argc, JS::Value *vp) {
 
   // use faster calling if no arguments are needed
   if (((nNormalArgs + nDefaultArgs) <= 0 && !varargs)) {
-    #if PY_VERSION_HEX >= 0x03090000
-    pyRval = PyObject_CallNoArgs(pyFunc);
-    #else
-    pyRval = _PyObject_CallNoArg(pyFunc); // in Python 3.8, the API is only available under the name with a leading underscore
-    #endif
+    pyRval = PyObject_CallObject(pyFunc, NULL);
     if (PyErr_Occurred() && setPyException(cx)) { // Check if an exception has already been set in Python error stack
       goto failure;
     }