Merge branch 'hpy-import'

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/hpy/cpython/autogen_api_impl.h

@@ -464,11 +464,21 @@ HPyAPI_FUNC HPy HPyUnicode_AsUTF8String(HPyContext *ctx, HPy h)
     return _py2h(PyUnicode_AsUTF8String(_h2py(h)));
 }
 
+HPyAPI_FUNC const char *HPyUnicode_AsUTF8AndSize(HPyContext *ctx, HPy h, HPy_ssize_t *size)
+{
+    return PyUnicode_AsUTF8AndSize(_h2py(h), size);
+}
+
 HPyAPI_FUNC HPy HPyUnicode_FromWideChar(HPyContext *ctx, const wchar_t *w, HPy_ssize_t size)
 {
     return _py2h(PyUnicode_FromWideChar(w, size));
 }
 
+HPyAPI_FUNC HPy HPyUnicode_DecodeFSDefault(HPyContext *ctx, const char *v)
+{
+    return _py2h(PyUnicode_DecodeFSDefault(v));
+}
+
 HPyAPI_FUNC int HPyList_Check(HPyContext *ctx, HPy h)
 {
     return PyList_Check(_h2py(h));

graalpython/com.oracle.graal.python.cext/include/hpy/runtime/ctx_funcs.h

@@ -28,7 +28,6 @@
 // This file contains the prototypes for all the functions defined in
 // hpy/devel/src/runtime/ctx_*.c
 
-#include <Python.h>
 #include "hpy.h"
 
 // ctx_bytes.c

graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_ctx.h

@@ -226,7 +226,9 @@ struct _HPyContext_s {
     HPy (*ctx_Unicode_FromString)(HPyContext *ctx, const char *utf8);
     int (*ctx_Unicode_Check)(HPyContext *ctx, HPy h);
     HPy (*ctx_Unicode_AsUTF8String)(HPyContext *ctx, HPy h);
+    const char *(*ctx_Unicode_AsUTF8AndSize)(HPyContext *ctx, HPy h, HPy_ssize_t *size);
     HPy (*ctx_Unicode_FromWideChar)(HPyContext *ctx, const wchar_t *w, HPy_ssize_t size);
+    HPy (*ctx_Unicode_DecodeFSDefault)(HPyContext *ctx, const char *v);
     int (*ctx_List_Check)(HPyContext *ctx, HPy h);
     HPy (*ctx_List_New)(HPyContext *ctx, HPy_ssize_t len);
     int (*ctx_List_Append)(HPyContext *ctx, HPy h_list, HPy h_item);

graalpython/com.oracle.graal.python.cext/include/hpy/universal/autogen_trampolines.h

@@ -451,10 +451,18 @@ HPyAPI_FUNC HPy HPyUnicode_AsUTF8String(HPyContext *ctx, HPy h) {
      return WRAP(ctx->ctx_Unicode_AsUTF8String ( ctx, UNWRAP(h) ));
 }
 
+HPyAPI_FUNC const char *HPyUnicode_AsUTF8AndSize(HPyContext *ctx, HPy h, HPy_ssize_t *size) {
+     return ctx->ctx_Unicode_AsUTF8AndSize ( ctx, UNWRAP(h), size );
+}
+
 HPyAPI_FUNC HPy HPyUnicode_FromWideChar(HPyContext *ctx, const wchar_t *w, HPy_ssize_t size) {
      return WRAP(ctx->ctx_Unicode_FromWideChar ( ctx, w, size ));
 }
 
+HPyAPI_FUNC HPy HPyUnicode_DecodeFSDefault(HPyContext *ctx, const char *v) {
+     return WRAP(ctx->ctx_Unicode_DecodeFSDefault ( ctx, v ));
+}
+
 HPyAPI_FUNC int HPyList_Check(HPyContext *ctx, HPy h) {
      return ctx->ctx_List_Check ( ctx, UNWRAP(h) );
 }

graalpython/com.oracle.graal.python.cext/include/hpy/version.h

@@ -1,4 +1,4 @@
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.0.3.dev308+ng7d457b4"
-#define HPY_GIT_REVISION "7d457b4"
+#define HPY_VERSION "0.0.3.dev317+ng8fe1487"
+#define HPY_GIT_REVISION "8fe1487"

graalpython/lib-graalpython/modules/hpy.devel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpy.devel
-Version: 0.0.3.dev308+ng7d457b4
+Version: 0.0.3.dev317+ng8fe1487
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

graalpython/lib-graalpython/modules/hpy/devel/src/runtime/argparse.c

@@ -78,6 +78,29 @@
  * ``d (float) [double]``
  *     Convert a Python floating point number to a C double.
  *
+ * Strings and buffers
+ * ~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * These formats allow accessing an object as a contiguous chunk of memory.
+ * You don't have to provide raw storage for the returned unicode or bytes
+ * area.
+ *
+ * In general, when a format sets a pointer to a buffer, the pointer is valid
+ * only until the corresponding HPy handle is closed.
+ *
+ * ``s (unicode) [const char*]``
+ *
+ * Convert a Unicode object to a C pointer to a character string.
+ * A pointer to an existing string is stored in the character pointer
+ * variable whose address you pass.  The C string is NUL-terminated.
+ * The Python string must not contain embedded null code points; if it does,
+ * a `ValueError` exception is raised. Unicode objects are converted
+ * to C strings using 'utf-8' encoding. If this conversion fails,
+ * a `UnicodeError` is raised.
+ *
+ * Note: This format does not accept bytes-like objects and is therefore
+ * not suitable for filesystem paths.
+ *
  * Handles (Python Objects)
  * ~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -361,11 +384,41 @@ parse_item(HPyContext *ctx, HPyTracker *ht, HPy current_arg, int current_arg_tmp
         break;
     }
 
-    default:
+    case 's': {
+        const char **output = va_arg(*vl, const char **);
+        if (!HPyUnicode_Check(ctx, current_arg)) {
+            set_error(ctx, ctx->h_TypeError, err_fmt, "a str is required");
+            return 0;
+        }
+        HPy_ssize_t size;
+        const char *data = HPyUnicode_AsUTF8AndSize(ctx, current_arg, &size);
+        if (data == NULL) {
+            set_error(ctx, ctx->h_SystemError, err_fmt, "unicode conversion error");
+            return 0;
+        }
+        // loop bounded by size is more robust/paranoid than strlen
+        HPy_ssize_t i;
+        for (i = 0; i < size; ++i) {
+            if (data[i] == '\0') {
+                set_error(ctx, ctx->h_ValueError, err_fmt, "embedded null character");
+                return 0;
+            }
+        }
+        if (data[i] != '\0') {
+            set_error(ctx, ctx->h_SystemError, err_fmt, "missing terminating null character");
+            return 0;
+        }
+        *output = data;
+        break;
+    }
+
+    default: {
         set_error(ctx, ctx->h_SystemError, err_fmt, "unknown arg format code");
         return 0;
     }
 
+    } // switch
+
     return 1;
 }
 

graalpython/lib-graalpython/modules/hpy/devel/version.py

@@ -22,5 +22,5 @@
 # SOFTWARE.
 
 # automatically generated by setup.py:get_scm_config()
-__version__ = "0.0.3.dev308+ng7d457b4"
-__git_revision__ = "7d457b4"
+__version__ = "0.0.3.dev317+ng8fe1487"
+__git_revision__ = "8fe1487"

graalpython/lib-graalpython/modules/hpy/test/support.py

@@ -304,7 +304,7 @@ def make_module(self, ExtensionTemplate, main_src, name, extra_sources):
         We don't want to unnecessarily modify the global state inside tests:
         if you are writing a test which needs a proper import, you should not
         use make_module but explicitly use compile_module and import it
-        manually as requied by your test.
+        manually as required by your test.
         """
         so_filename = self.compile_module(
             ExtensionTemplate, main_src, name, extra_sources)

graalpython/lib-graalpython/modules/hpy/test/test_argparse.py

@@ -79,6 +79,21 @@ def test_b(self):
             "function unsigned byte integer is less than minimum"
         )
 
+    def test_s(self):
+        import pytest
+        mod = self.make_parse_item("s", "const char*", "HPyUnicode_FromString")
+        assert mod.f("hello HPy") == "hello HPy"
+        with pytest.raises(ValueError) as err:
+            mod.f(b"hello\0HPy".decode('utf-8'))
+        assert str(err.value) == (
+            "function embedded null character"
+        )
+        with pytest.raises(TypeError) as err:
+            mod.f(b"hello HPy")
+        assert str(err.value) == (
+            "function a str is required"
+        )
+
     def test_B(self):
         mod = self.make_parse_item("B", "char", "char_to_hpybytes")
         assert mod.f(0) == b"\x00"