Update patch for pythran

Author: msimacek

graalpython/lib-graalpython/patches/metadata.toml

@@ -513,11 +513,15 @@ patch = 'pythran-0.12.0.patch'
 license = 'BSD-3-Clause'
 
 [[pythran.rules]]
-install-priority = 10
 version = '== 0.13.*'
 patch = 'pythran-0.13.patch'
 license = 'BSD-3-Clause'
 
+[[pythran.rules]]
+version = '>= 0.14'
+patch = 'pythran-0.15.patch'
+license = 'BSD-3-Clause'
+
 [[pyzmq.rules]]
 # 26+ needs Cython 3
 version = '< 26'

graalpython/lib-graalpython/patches/pythran-0.13.patch

@@ -1,26 +1,44 @@
 diff --git a/pythran/pythonic/python/core.hpp b/pythran/pythonic/python/core.hpp
-index ff44c01..23b4413 100644
+index 4cbe3e0..24340b0 100644
 --- a/pythran/pythonic/python/core.hpp
 +++ b/pythran/pythonic/python/core.hpp
-@@ -53,7 +53,7 @@ namespace python
+@@ -53,7 +53,14 @@ namespace python
  {
 
  #ifndef PyString_AS_STRING
 -#define PyString_AS_STRING (char *)_PyUnicode_COMPACT_DATA
-+#define PyString_AS_STRING PyBytes_AS_STRING
++  static inline const char* PyString_AS_STRING(PyObject* obj) {
++      const char* str = PyUnicode_AsUTF8(obj);
++      if (!str) {
++          PyErr_Clear();
++          str = "<invalid string>";
++      }
++      return str;
++  }
  #endif
 
    inline void PyObject_TypePrettyPrinter(std::ostream &oss, PyObject *obj)
 diff --git a/pythran/pythonic/types/str.hpp b/pythran/pythonic/types/str.hpp
-index 1f7a981..00440a9 100644
+index 1f7a981..e975333 100644
 --- a/pythran/pythonic/types/str.hpp
 +++ b/pythran/pythonic/types/str.hpp
-@@ -744,7 +744,7 @@ namespace std
- #define PyString_Check(x) PyUnicode_Check(x) && PyUnicode_IS_COMPACT_ASCII(x)
+@@ -741,10 +741,17 @@ namespace std
+ #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
+ 
+ #ifndef PyString_Check
+-#define PyString_Check(x) PyUnicode_Check(x) && PyUnicode_IS_COMPACT_ASCII(x)
++#define PyString_Check(x) PyUnicode_Check(x)
  #endif
  #ifndef PyString_AS_STRING
 -#define PyString_AS_STRING (char *)_PyUnicode_COMPACT_DATA
-+#define PyString_AS_STRING PyBytes_AS_STRING
++  static inline const char* PyString_AS_STRING(PyObject* obj) {
++      const char* str = PyUnicode_AsUTF8(obj);
++      if (!str) {
++          PyErr_Clear();
++          str = "<invalid string>";
++      }
++      return str;
++  }
  #endif
  #ifndef PyString_GET_SIZE
  #define PyString_GET_SIZE PyUnicode_GET_LENGTH

graalpython/lib-graalpython/patches/pythran-0.15.patch

@@ -0,0 +1,58 @@
+diff --git a/pythran/pythonic/python/core.hpp b/pythran/pythonic/python/core.hpp
+index 4cbe3e0..24340b0 100644
+--- a/pythran/pythonic/python/core.hpp
++++ b/pythran/pythonic/python/core.hpp
+@@ -53,7 +53,14 @@ namespace python
+ {
+ 
+ #ifndef PyString_AS_STRING
+-#define PyString_AS_STRING (char *)_PyUnicode_COMPACT_DATA
++  static inline const char* PyString_AS_STRING(PyObject* obj) {
++      const char* str = PyUnicode_AsUTF8(obj);
++      if (!str) {
++          PyErr_Clear();
++          str = "<invalid string>";
++      }
++      return str;
++  }
+ #endif
+ 
+   inline void PyObject_TypePrettyPrinter(std::ostream &oss, PyObject *obj)
+diff --git a/pythran/pythonic/types/str.hpp b/pythran/pythonic/types/str.hpp
+index 1f7a981..e975333 100644
+--- a/pythran/pythonic/types/str.hpp
++++ b/pythran/pythonic/types/str.hpp
+@@ -741,10 +741,17 @@ namespace std
+ #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
+ 
+ #ifndef PyString_Check
+-#define PyString_Check(x) PyUnicode_Check(x) && PyUnicode_IS_COMPACT_ASCII(x)
++#define PyString_Check(x) PyUnicode_Check(x)
+ #endif
+ #ifndef PyString_AS_STRING
+-#define PyString_AS_STRING (char *)_PyUnicode_COMPACT_DATA
++  static inline const char* PyString_AS_STRING(PyObject* obj) {
++      const char* str = PyUnicode_AsUTF8(obj);
++      if (!str) {
++          PyErr_Clear();
++          str = "<invalid string>";
++      }
++      return str;
++  }
+ #endif
+ #ifndef PyString_GET_SIZE
+ #define PyString_GET_SIZE PyUnicode_GET_LENGTH
+diff --git a/pythran/tables.py b/pythran/tables.py
+index d1d2027..eb631fd 100644
+--- a/pythran/tables.py
++++ b/pythran/tables.py
+@@ -4595,7 +4595,8 @@ def save_arguments(module_name, elements):
+             defaults = list(spec.defaults or [])
+             args += [ast.Name(arg, ast.Param(), None, None)
+                      for arg in spec.kwonlyargs]
+-            defaults += [spec.kwonlydefaults[kw] for kw in spec.kwonlyargs]
++            if spec.kwonlydefaults:
++                defaults += [spec.kwonlydefaults[kw] for kw in spec.kwonlyargs]
+ 
+             # Check if we already have a pythran description for that object
+             if signature.args.args: