[GR-21590] Update Python imports

PullRequest: graalpython/2511

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "51619132bad52d7603bb988bcbda1ff372d2aac1" }
+{ "overlay": "b7f2a8abd1005a8ef57418f3f20a81c3696f9cfe" }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/WrapperDescriptorBuiltins.java

@@ -104,7 +104,12 @@ abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         static TruffleString reprClassFunction(PBuiltinFunction self,
                         @Cached StringUtils.SimpleTruffleStringFormatNode simpleTruffleStringFormatNode) {
-            return simpleTruffleStringFormatNode.format("<slot wrapper '%s' of '%s' objects>", self.getName(), TypeNodes.GetNameNode.doSlowPath(self.getEnclosingType()));
+            if (self.getEnclosingType() == null) {
+                // XXX: this is wrong
+                return simpleTruffleStringFormatNode.format("<builtin_function_or_method '%s'>", self.getName());
+            } else {
+                return simpleTruffleStringFormatNode.format("<slot wrapper '%s' of '%s' objects>", self.getName(), TypeNodes.GetNameNode.doSlowPath(self.getEnclosingType()));
+            }
         }
     }
 }

mx.graalpython/mx_graalpython.py

@@ -773,7 +773,10 @@ def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=Fa
         else:
             # If 'python_binary' is a SVM launcher, we need to add '--jvm' and prefix each Java arg with '--vm.'
             def graalvm_vm_arg(java_arg):
-                assert java_arg[0] == "-"
+                if java_arg.startswith("@") and os.path.exists(java_arg[1:]):
+                    with open(java_arg[1:], "r") as f:
+                        java_arg = f.read()
+                assert java_arg[0] == "-", java_arg
                 return "--vm." + java_arg[1:]
             agent_args = ' '.join(graalvm_vm_arg(arg) for arg in mx_gate.get_jacoco_agent_args() or [])
 

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "379f8855050b04d41fd43391ed19eddfacaf5d50",
+                "version": "4d1ff9c2d204ae0118adc54a999e7650c5855d34",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "379f8855050b04d41fd43391ed19eddfacaf5d50",
+                "version": "4d1ff9c2d204ae0118adc54a999e7650c5855d34",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "379f8855050b04d41fd43391ed19eddfacaf5d50",
+                "version": "4d1ff9c2d204ae0118adc54a999e7650c5855d34",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},