[GR-55955] Fixes for virtualenv

msimacek · msimacek · commit bd7ad3cfc02a · 2024-12-16T10:59:40.000Z
PullRequest: graalpython/3618
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_unicode.py b/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: (
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -330,6 +330,10 @@ public void postInitialize(Python3Core core) {
             }
             Object key, val;
             if (PythonOS.getPythonOS() == PythonOS.PLATFORM_WIN32) {
+                if (entry.getKey().startsWith("=")) {
+                    // Hidden variable, shouldn't be visible to python
+                    continue;
+                }
                 key = toTruffleStringUncached(entry.getKey());
             } else {
                 key = core.factory().createBytes(entry.getKey().getBytes());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextUnicodeBuiltins.java b/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
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java b/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)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberCheckNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberCheckNode.java
@@ -66,6 +66,10 @@
 public abstract class PyNumberCheckNode extends PNodeWithContext {
     public abstract boolean execute(Node inliningTarget, Object object);
 
+    public static boolean executeUncached(Object object) {
+        return PyNumberCheckNodeGen.getUncached().execute(null, object);
+    }
+
     @Specialization
     static boolean doString(@SuppressWarnings("unused") TruffleString object) {
         return false;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberIndexNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberIndexNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -86,6 +86,10 @@
 public abstract class PyNumberIndexNode extends PNodeWithContext {
     public abstract Object execute(Frame frame, Node inliningTarget, Object object);
 
+    public static Object executeUncached(Object object) {
+        return PyNumberIndexNodeGen.getUncached().execute(null, null, object);
+    }
+
     @Specialization
     static int doInt(int object) {
         return object;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java
@@ -46,7 +46,6 @@
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -124,10 +123,6 @@ public static LookupAndCallBinaryNode create(SpecialMethodSlot slot, SpecialMeth
         return LookupAndCallReversibleBinaryNodeGen.create(slot, rslot, null, alwaysCheckReverse, ignoreDescriptorException);
     }
 
-    protected static Object getMethod(Object receiver, TruffleString methodName) {
-        return LookupSpecialMethodNode.Dynamic.executeUncached(null, GetClassNode.executeUncached(receiver), methodName, receiver);
-    }
-
     @ImportStatic(PGuards.class)
     @GenerateInline
     @GenerateCached(false)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -87,8 +87,8 @@ public abstract static class Dynamic extends Node {
 
         public abstract Object execute(Frame frame, Node inliningTarget, Object type, TruffleString name, Object receiver);
 
-        public static Object executeUncached(Frame frame, Object type, TruffleString name, Object receiver) {
-            return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(frame, null, type, name, receiver);
+        public static Object executeUncached(Object type, TruffleString name, Object receiver) {
+            return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(null, null, type, name, receiver);
         }
 
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java
@@ -6,9 +6,6 @@
  */
 package com.oracle.graal.python.runtime.formatting;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___INDEX__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___INT__;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -20,19 +17,19 @@
 
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
+import com.oracle.graal.python.lib.PyNumberCheckNode;
+import com.oracle.graal.python.lib.PyNumberIndexNode;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNodeGen;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -94,7 +91,7 @@ <F extends InternalFormat.Formatter> F setupFormat(F f) {
     protected abstract boolean isMapping(Object obj);
 
     static Object lookupAttribute(Object owner, TruffleString name) {
-        return LookupAttributeInMRONode.Dynamic.getUncached().execute(GetClassNode.executeUncached(owner), name);
+        return LookupSpecialMethodNode.Dynamic.executeUncached(GetClassNode.executeUncached(owner), name, owner);
     }
 
     static Object call(Object callable, Object... args) {
@@ -190,20 +187,18 @@ protected final Object asNumber(Object arg, char specType) {
         } else if (arg instanceof Boolean) {
             // Fast path for simple booleans
             return (Boolean) arg ? 1 : 0;
-        } else if (arg instanceof PythonAbstractObject) {
-            // Try again with arg.__int__() or __index__() depending on the spec type
+        } else if (PyNumberCheckNode.executeUncached(arg)) {
             try {
-                TruffleString magicName = useIndexMagicMethod(specType) ? T___INDEX__ : T___INT__;
-                Object attribute = lookupAttribute(arg, magicName);
-                if (!(attribute instanceof PNone)) {
-                    return call(attribute, arg);
+                if (useIndexMagicMethod(specType)) {
+                    return PyNumberIndexNode.executeUncached(arg);
+                } else {
+                    return CallNode.executeUncached(PythonBuiltinClassType.PInt, arg);
                 }
             } catch (PException e) {
-                e.expectUncached(AttributeError);
-                // No __int__/__index__ defined (at Python level)
+                e.expectUncached(TypeError);
             }
         }
-        return arg;
+        return null;
     }
 
     protected double asFloat(Object arg) {
diff --git a/graalpython/lib-python/3/subprocess.py b/graalpython/lib-python/3/subprocess.py
@@ -72,9 +72,8 @@
 except ModuleNotFoundError:
     _mswindows = False
 else:
-    # Truffle change
-    # _mswindows = True
-    _mswindows = False
+    # GraalPy change: under emulated posix, use the posix APIs even under windows
+    _mswindows = not (sys.implementation.name == 'graalpy' and __graalpython__.posix_module_backend() == 'java')
 
 # wasm32-emscripten and wasm32-wasi do not support processes
 _can_fork_exec = sys.platform not in {"emscripten", "wasi"}
@@ -850,12 +849,14 @@ def __init__(self, args, bufsize=-1, executable=None,
             if pass_fds and not close_fds:
                 warnings.warn("pass_fds overriding close_fds.", RuntimeWarning)
                 close_fds = True
-            if startupinfo is not None:
-                raise ValueError("startupinfo is only supported on Windows "
-                                 "platforms")
-            if creationflags != 0:
-                raise ValueError("creationflags is only supported on Windows "
-                                 "platforms")
+            # GraalPy change: allow and ignore windows-specific flags on windows on posix backend
+            if sys.platform != 'win32':
+                if startupinfo is not None:
+                    raise ValueError("startupinfo is only supported on Windows "
+                                     "platforms")
+                if creationflags != 0:
+                    raise ValueError("creationflags is only supported on Windows "
+                                     "platforms")
 
         self.args = args
         self.stdin = None

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -87,8 +87,8 @@ public abstract static class Dynamic extends Node {`
`87`	`87`
`88`	`88`	`public abstract Object execute(Frame frame, Node inliningTarget, Object type, TruffleString name, Object receiver);`
`89`	`89`
`90`		`- public static Object executeUncached(Frame frame, Object type, TruffleString name, Object receiver) {`
`91`		`- return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(frame, null, type, name, receiver);`
	`90`	`+ public static Object executeUncached(Object type, TruffleString name, Object receiver) {`
	`91`	`+ return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(null, null, type, name, receiver);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Specialization`