[GR-54196] Fixes for elasticsearch

PullRequest: graalpython/3339

Author: msimacek

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

@@ -5528,6 +5528,10 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
 PyObject *
 PyObject_GenericGetDict(PyObject *obj, void *context)
 {
+    // GraalPy change: upcall for managed
+    if (points_to_py_handle_space(obj)) {
+        return GraalPyTruffleObject_GenericGetDict(obj);
+    }
     PyObject *dict;
     // GraalPy change: we don't have inlined values in managed dict
     PyObject **dictptr = _PyObject_GetDictPtr(obj);

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

@@ -1595,6 +1595,26 @@ def __hash__(self):
         cmpfunc=unhandled_error_compare
     )
 
+    object_with_attributes = MyObject()
+    object_with_attributes.foo = 1
+
+    test_PyObject_GenericGetDict = CPyExtFunction(
+        lambda args: args[0].__dict__,
+        lambda: (
+            (TestObjectFunctions.object_with_attributes,),
+        ),
+        code='''
+        static PyObject* wrap_PyObject_GenericGetDict(PyObject* obj) {
+            return PyObject_GenericGetDict(obj, NULL);
+        }
+        ''',
+        arguments=["PyObject* obj"],
+        resultspec="O",
+        argspec="O",
+        callfunction="wrap_PyObject_GenericGetDict",
+        cmpfunc=unhandled_error_compare
+    )
+
 
 class TestPickleNative:
     def test_pickle_native(self):

graalpython/com.oracle.graal.python.test/src/tests/test_json.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -37,6 +37,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import json
+import os
 import unittest
 
 BIGINT_JSON_DATA = '''
@@ -58,16 +60,13 @@
 
 class JsonTest(unittest.TestCase):
     def test_dump(self):
-        import json
-        import os
         cwd = os.getcwd()
         new_file_path = os.path.join(cwd, 'myFile.json')
         json.dump(['a', 'b', 'c'], open(new_file_path, 'w'))
         assert json.load(open(new_file_path)) == ['a', 'b', 'c']
         os.remove(new_file_path)
 
-    def test_load_bigin(self):
-        import json
+    def test_load_bigint(self):
         data = json.loads(BIGINT_JSON_DATA)
         assert "int_values" in data
         int_values_ = data['int_values']
@@ -83,3 +82,9 @@ def test_load_bigin(self):
             1521583201347000000,
             10,
         }
+
+    def test_encode_surrogate(self):
+        s = json.dumps({'foo': "\uda6a"})
+        assert s == '{"foo": "\\uda6a"}'
+        s = json.dumps({'foo': "\uda6a"}, ensure_ascii=False)
+        assert s == '{"foo": "\uda6a"}'

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

@@ -126,6 +126,7 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
@@ -739,4 +740,14 @@ static Object dir(Object object,
             return dir.execute(null, inliningTarget, object);
         }
     }
+
+    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Ignored)
+    abstract static class PyTruffleObject_GenericGetDict extends CApiUnaryBuiltinNode {
+        @Specialization
+        static Object getDict(Object object,
+                        @Bind("this") Node inliningTarget,
+                        @Cached GetOrCreateDictNode getDict) {
+            return getDict.execute(inliningTarget, object);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -102,7 +102,7 @@ static void appendStringUncached(TruffleString ts, TruffleStringBuilderUTF32 bui
                             appendEscapedUtf16Uncached((char) (0xDC00 + ((c - 0x10000) & 0x3FF)), builder);
                         }
                     } else {
-                        builder.appendCodePointUncached(c);
+                        builder.appendCodePointUncached(c, 1, true);
                     }
                     break;
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -225,7 +225,6 @@ private static void setRootNodeFileName(RootNode rootNode, TruffleString filenam
     @TruffleBoundary
     public static TruffleString extractFileName(RootNode rootNode) {
         RootNode funcRootNode = rootNodeForExtraction(rootNode);
-        SourceSection src = funcRootNode.getSourceSection();
 
         PythonContext context = PythonContext.get(rootNode);
         TruffleString filename;
@@ -242,6 +241,7 @@ public static TruffleString extractFileName(RootNode rootNode) {
             // for compiled modules, _imp._fix_co_filename will set the filename
             return filename;
         }
+        SourceSection src = funcRootNode.getSourceSection();
         String jFilename;
         if (src != null) {
             jFilename = getSourceSectionFileName(src);