Merge branch 'master' into thh/intrinsify-csv-module

Author: phoeinx

CHANGELOG.md

@@ -7,6 +7,7 @@ language runtime. The main focus is on user-observable behavior of the engine.
 * Added support for `pyexpat` module.
 * Added partial support for `PYTHONHASHSEED` environment variable (also available via `HashSeed` context option), currently only affecting hashing in `pyexpat` module.
 * Implement `_csv` module.
+* Improved compatibility with PyPI packages `wheel` and `click`
 
 ## Version 21.3.0
 

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -187,6 +187,7 @@ declare_type(PyMethodDescr_Type, method_descriptor, PyMethodDescrObject);
 declare_type(PyGetSetDescr_Type, getset_descriptor, PyGetSetDescrObject);
 declare_type(PyMemberDescr_Type, member_descriptor, PyMemberDescrObject);
 declare_type(_PyExc_BaseException, BaseException, PyBaseExceptionObject);
+declare_type(_PyExc_StopIteration, StopIteration, PyStopIterationObject);
 declare_type(PyBuffer_Type, buffer, PyBufferDecorator);
 declare_type(PyFunction_Type, function, PyFunctionObject);
 declare_type(PyMethod_Type, method, PyMethodObject);

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -86,6 +86,7 @@ typedef struct {
 
 PyAPI_DATA(PyTypeObject) PyBuffer_Type;
 PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
+PyAPI_DATA(PyTypeObject) _PyExc_StopIteration;
 
 typedef void (*init_upcall)();
 
@@ -331,6 +332,7 @@ void initialize_hashes();
 #define JWRAPPER_OBJOBJPROC                  39
 #define JWRAPPER_OBJOBJARGPROC               40
 #define JWRAPPER_NEW                         41
+#define JWRAPPER_MP_DELITEM                  42
 
 #define TDEBUG __builtin_debugtrap()
 #define get_method_flags_wrapper(flags)                                                  \

graalpython/com.oracle.graal.python.cext/src/errors.c

@@ -223,7 +223,7 @@ PyObject* PyErr_SetFromErrnoWithFilenameObjects(PyObject* exc, PyObject* filenam
         char *s = strerror(i);
         // TODO(fa): use PyUnicode_DecodeLocale once available
         // message = PyUnicode_DecodeLocale(s, "surrogateescape");
-        message = polyglot_from_string(s, SRC_CS);
+        message = PyUnicode_FromString(s);
     }
     else {
         /* Sometimes errno didn't get set */

graalpython/com.oracle.graal.python.cext/src/exceptions.c

@@ -43,6 +43,7 @@
 #include <pyerrors.h>
 
 PyTypeObject _PyExc_BaseException = PY_TRUFFLE_TYPE("BaseException", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyBaseExceptionObject));
+PyTypeObject _PyExc_StopIteration = PY_TRUFFLE_TYPE("StopIteration", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyStopIterationObject));
 
 #define PY_EXCEPTION(__EXC_NAME__) (UPCALL_CEXT_O(polyglot_from_string("PyTruffle_Type", SRC_CS), polyglot_from_string(__EXC_NAME__, SRC_CS)))
 

graalpython/com.oracle.graal.python.cext/src/listobject.c

@@ -106,3 +106,8 @@ UPCALL_ID(PyList_Insert);
 int PyList_Insert(PyObject *op, Py_ssize_t where, PyObject *newitem) {
     return UPCALL_CEXT_I(_jls_PyList_Insert, native_to_java(op), where, native_to_java(newitem));
 }
+
+UPCALL_ID(PyList_Reverse);
+PyAPI_FUNC(int) PyList_Reverse(PyObject *self) {
+    return UPCALL_CEXT_I(_jls_PyList_Reverse, native_to_java(self));
+}

graalpython/com.oracle.graal.python.cext/src/pystate.c

@@ -78,9 +78,17 @@ PyThreadState* PyGILState_GetThisThreadState(void) {
     return polyglot_invoke(PY_TRUFFLE_CEXT, "PyThreadState_Get");
 }
 
-UPCALL_ID(PyState_FindModule)
+typedef PyObject* (*find_module_fun_t)(long index);
+UPCALL_TYPED_ID(PyState_FindModule, find_module_fun_t);
 PyObject* PyState_FindModule(struct PyModuleDef* module) {
-    return UPCALL_CEXT_O(_jls_PyState_FindModule, module->m_base.m_index);
+    Py_ssize_t index = module->m_base.m_index;
+    if (module->m_slots) {
+        return NULL;
+    } else if (index == 0) {
+        return NULL;
+    } else {
+        return _jls_PyState_FindModule(index);
+    }
 }
 
 int PyState_AddModule(PyObject* module, struct PyModuleDef* def) {

graalpython/com.oracle.graal.python.cext/src/setobject.c

@@ -92,3 +92,8 @@ UPCALL_ID(PySet_Discard);
 int PySet_Discard(PyObject *set, PyObject *key) {
     return UPCALL_CEXT_I(_jls_PySet_Discard, native_to_java(set), native_to_java(key));
 }
+
+UPCALL_ID(PySet_Clear);
+int PySet_Clear(PyObject *set) {
+    return UPCALL_CEXT_I(_jls_PySet_Clear, native_to_java(set));
+}

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -680,6 +680,7 @@ int PyType_Ready(PyTypeObject* cls) {
         ADD_SLOT_CONV("__len__", mappings->mp_length, -1, JWRAPPER_LENFUNC);
         ADD_SLOT_CONV("__getitem__", mappings->mp_subscript, -2, JWRAPPER_BINARYFUNC);
         ADD_SLOT_CONV("__setitem__", mappings->mp_ass_subscript, -3, JWRAPPER_OBJOBJARGPROC);
+        ADD_SLOT_CONV("__delitem__", mappings->mp_ass_subscript, -3, JWRAPPER_MP_DELITEM);
     }
 
     PyAsyncMethods* async = cls->tp_as_async;

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -665,3 +665,8 @@ UPCALL_ID(PyUnicode_ReadChar);
 Py_UCS4 PyUnicode_ReadChar(PyObject *unicode, Py_ssize_t index) {
 	return UPCALL_CEXT_I(_jls_PyUnicode_ReadChar, native_to_java(unicode), index);
 }
+
+UPCALL_ID(PyUnicode_Contains)
+int PyUnicode_Contains(PyObject *str, PyObject *substr) {
+    return UPCALL_CEXT_I(_jls_PyUnicode_Contains, native_to_java(str), native_to_java(substr));
+}