Add PyUnicode_EncodeLocale

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_unicode.py

@@ -946,6 +946,19 @@ class TestPyUnicode(CPyExtTestCase):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyUnicode_EncodeLocale = CPyExtFunction(
+        # We don't want to make tests dependent on the current locale, so just test that ascii works
+        lambda args: args[0].encode('ascii', args[1]),
+        lambda: (
+            ("hello", "strict"),
+            (UnicodeSubclass("asdf"), "strict"),
+        ),
+        resultspec="O",
+        argspec='Os',
+        arguments=["PyObject* str", "const char* errors"],
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PyUnicode_AsUnicodeEscapeString = CPyExtFunction(
         _reference_as_unicode_escape_string,
         lambda: (

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextUnicodeBuiltins.java

@@ -89,6 +89,7 @@
 import com.oracle.graal.python.builtins.modules.BuiltinFunctions.ChrNode;
 import com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins.CodecsEncodeNode;
+import com.oracle.graal.python.builtins.modules.CodecsTruffleModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi5BuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi6BuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
@@ -954,6 +955,18 @@ static PBytes fromObject(Object s,
         }
     }
 
+    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, ConstCharPtrAsTruffleString}, call = Direct)
+    abstract static class PyUnicode_EncodeLocale extends CApiBinaryBuiltinNode {
+        @Specialization
+        static Object encode(Object s, Object errors,
+                        @Bind("this") Node inliningTarget,
+                        @Cached CastToTruffleStringNode cast,
+                        @Cached CodecsTruffleModuleBuiltins.GetEncodingNode getEncodingNode,
+                        @Cached CodecsModuleBuiltins.EncodeNode encodeNode) {
+            return encodeNode.execute(null, cast.execute(inliningTarget, s), getEncodingNode.execute(null), errors);
+        }
+    }
+
     @CApiBuiltin(ret = PyObjectTransfer, args = {CONST_WCHAR_PTR, Py_ssize_t}, call = Direct)
     abstract static class PyUnicode_FromWideChar extends CApiBinaryBuiltinNode {
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -937,7 +937,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyUnicode_DecodeUTF7", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_DecodeUTF7Stateful", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString, PY_SSIZE_T_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_DecodeUnicodeEscape", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString}, call = NotImplemented)
-    @CApiBuiltin(name = "PyUnicode_EncodeLocale", ret = PyObject, args = {PyObject, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_FSDecoder", ret = Int, args = {PyObject, Pointer}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_Fill", ret = Py_ssize_t, args = {PyObject, Py_ssize_t, Py_ssize_t, PY_UCS4}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_GetDefaultEncoding", ret = ConstCharPtrAsTruffleString, args = {}, call = NotImplemented)