Merge branch 'msimacek/GR-50471_fix_poetry' into msimacek/GR-50050_unittest_assertions

msimacek · msimacek · commit a78ccd3e99f0 · 2023-12-04T14:54:06.000+01:00
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/FileDescriptorConversionNodeTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/FileDescriptorConversionNodeTests.java
@@ -76,12 +76,6 @@ public void none() {
         Assert.assertEquals(AT_FDCWD.value, call(PNone.NO_VALUE));
     }
 
-    @Test
-    public void noValue() {
-        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
-        call(PNone.NO_VALUE);
-    }
-
     @Test
     public void fdBool() {
         Assert.assertEquals(0, call(false));
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_object.py b/graalpython/com.oracle.graal.python.test/src/tests/test_object.py
@@ -179,6 +179,8 @@ def test_descr_call_with_none():
     descr = object.__dict__['__class__']
     assert None.__class__ is type(None)
     assert descr.__get__(None, type(None)) is descr
+    assert None.__repr__() == 'None'
+    assert None.__bool__() is False
     assert_raises(TypeError, descr.__get__, None, None)
 
 def test_custom_getattribute():
@@ -224,4 +226,4 @@ def __getattribute__(self, name):
                 return super().__getattribute__(name)
 
     d = {"abc": 1}
-    assert dict(BBB(d)) == d
+    assert dict(BBB(d)) == d
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/RandomModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/RandomModuleBuiltins.java
@@ -33,6 +33,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.random.PRandom;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -65,7 +66,7 @@ abstract static class PRandomNode extends PythonBuiltinNode {
         PRandom random(VirtualFrame frame, Object cls, Object seed,
                         @Cached PythonObjectFactory factory) {
             PRandom random = factory.createRandom(cls);
-            setSeed.executeObject(frame, random, seed);
+            setSeed.executeObject(frame, random, seed != PNone.NO_VALUE ? seed : PNone.NONE);
             return random;
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/NoneBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/NoneBuiltins.java
@@ -52,7 +52,9 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
+import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
@@ -62,6 +64,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -120,7 +123,10 @@ static Object doIt(VirtualFrame frame, Object object, Object keyObj,
                         @Cached LookupAttributeInMRONode.Dynamic lookup,
                         @Cached CallUnaryMethodNode callGet,
                         @Cached CastToTruffleStringNode castKeyToStringNode,
+                        @Cached PythonObjectFactory.Lazy factory,
+                        @Cached ObjectBuiltins.GetAttributeNode getAttributeNode,
                         @Cached PRaiseNode.Lazy raiseNode) {
+            assert object == PNone.NONE;
             TruffleString key;
             try {
                 key = castKeyToStringNode.execute(inliningTarget, keyObj);
@@ -130,14 +136,20 @@ static Object doIt(VirtualFrame frame, Object object, Object keyObj,
 
             Object descr = lookup.execute(PythonBuiltinClassType.PNone, key);
             if (descr == PNone.NO_VALUE) {
-                throw raiseNode.get(inliningTarget).raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, object, key);
+                throw raiseNode.get(inliningTarget).raise(AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, PNone.NONE, key);
             }
             if (descr instanceof GetSetDescriptor getSetDescriptor) {
                 // Bypass getset_descriptor.__get__
                 assert getSetDescriptor.getGet() != null;
-                return callGet.executeObject(frame, getSetDescriptor.getGet(), object);
+                return callGet.executeObject(frame, getSetDescriptor.getGet(), PNone.NONE);
             }
-            return descr;
+            if (descr instanceof PBuiltinFunction function) {
+                // Bypass method_descriptor.__get__
+                assert !function.needsDeclaringType();
+                return factory.get(inliningTarget).createBuiltinMethod(PNone.NONE, function);
+            }
+            // Delegate classmethods, staticmethods etc. to object.__getattribute__
+            return getAttributeNode.execute(frame, PNone.NONE, key);
         }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictViewBuiltins.java
@@ -492,19 +492,7 @@ static PBaseSet doItemsView(VirtualFrame frame, PDictItemsView self, PBaseSet ot
         }
 
         @Specialization
-        static PBaseSet doNotIterable(VirtualFrame frame, PDictItemsView self, PDictItemsView other,
-                        @Bind("this") Node inliningTarget,
-                        @Shared("constrSet") @Cached SetNodes.ConstructSetNode constructSetNode,
-                        @Shared("diff") @Cached HashingStorageDiff diffNode,
-                        @Shared @Cached PythonObjectFactory factory) {
-            PSet selfSet = constructSetNode.executeWith(frame, self);
-            PSet otherSet = constructSetNode.executeWith(frame, other);
-            HashingStorage storage = diffNode.execute(frame, inliningTarget, selfSet.getDictStorage(), otherSet.getDictStorage());
-            return factory.createSet(storage);
-        }
-
-        @Specialization
-        static PBaseSet doItemsView(VirtualFrame frame, PDictItemsView self, Object other,
+        static PBaseSet doGeneric(VirtualFrame frame, Object self, Object other,
                         @Bind("this") Node inliningTarget,
                         @Shared("constrSet") @Cached SetNodes.ConstructSetNode constructSetNode,
                         @Shared("diff") @Cached HashingStorageDiff diffNode,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -432,11 +432,10 @@ Object doItTruffleString(VirtualFrame frame, Object object, @SuppressWarnings("u
                         @SuppressWarnings("unused") @Cached("keyObj") TruffleString cachedKey,
                         @Exclusive @Cached GetClassNode getClassNode,
                         @Cached("create(cachedKey)") LookupAttributeInMRONode lookup,
-                        @Exclusive @Cached PythonObjectFactory.Lazy factory,
                         @Exclusive @Cached PRaiseNode.Lazy raiseNode) {
             Object type = getClassNode.execute(inliningTarget, object);
             Object descr = lookup.execute(type);
-            return fullLookup(frame, inliningTarget, object, cachedKey, type, descr, factory, raiseNode);
+            return fullLookup(frame, inliningTarget, object, cachedKey, type, descr, raiseNode);
         }
 
         @Specialization
@@ -446,7 +445,6 @@ Object doIt(VirtualFrame frame, Object object, Object keyObj,
                         @Cached LookupAttributeInMRONode.Dynamic lookup,
                         @Exclusive @Cached GetClassNode getClassNode,
                         @Cached CastToTruffleStringNode castKeyToStringNode,
-                        @Exclusive @Cached PythonObjectFactory.Lazy factory,
                         @Exclusive @Cached PRaiseNode.Lazy raiseNode) {
             TruffleString key;
             try {
@@ -457,10 +455,10 @@ Object doIt(VirtualFrame frame, Object object, Object keyObj,
 
             Object type = getClassNode.execute(inliningTarget, object);
             Object descr = lookup.execute(type, key);
-            return fullLookup(frame, inliningTarget, object, key, type, descr, factory, raiseNode);
+            return fullLookup(frame, inliningTarget, object, key, type, descr, raiseNode);
         }
 
-        private Object fullLookup(VirtualFrame frame, Node inliningTarget, Object object, TruffleString key, Object type, Object descr, PythonObjectFactory.Lazy factory, PRaiseNode.Lazy raiseNode) {
+        private Object fullLookup(VirtualFrame frame, Node inliningTarget, Object object, TruffleString key, Object type, Object descr, PRaiseNode.Lazy raiseNode) {
             Object dataDescClass = null;
             boolean hasDescr = descr != PNone.NO_VALUE;
             if (hasDescr && (profileFlags & HAS_DESCR) == 0) {
@@ -501,14 +499,6 @@ private Object fullLookup(VirtualFrame frame, Node inliningTarget, Object object
                 profileFlags |= HAS_NO_VALUE;
             }
             if (hasDescr) {
-                if (object == PNone.NONE) {
-                    if (descr instanceof PBuiltinFunction) {
-                        // Special case for None object. We cannot call function.__get__(None,
-                        // type(None)),
-                        // because that would return an unbound method
-                        return factory.get(inliningTarget).createBuiltinMethod(PNone.NONE, (PBuiltinFunction) descr);
-                    }
-                }
                 Object get = lookupGet(dataDescClass);
                 if (get == PNone.NO_VALUE) {
                     return descr;
diff --git a/graalpython/lib-graalpython/patches/rapidfuzz/metadata.toml b/graalpython/lib-graalpython/patches/rapidfuzz/metadata.toml
@@ -0,0 +1,2 @@
+[[rules]]
+patch = 'rapidfuzz.patch'
diff --git a/graalpython/lib-graalpython/patches/rapidfuzz/rapidfuzz.patch b/graalpython/lib-graalpython/patches/rapidfuzz/rapidfuzz.patch
@@ -0,0 +1,23 @@
+diff --git a/setup.py b/setup.py
+index dcfa932..260376d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,7 @@
+ from __future__ import annotations
+ 
+ import os
++import sys
+ 
+ 
+ def show_message(*lines):
+@@ -69,7 +70,9 @@ packaging = "1" in {
+     os.environ.get("PIWHEELS_BUILD", "0"),
+     os.environ.get("RAPIDFUZZ_BUILD_EXTENSION", "0"),
+ }
+-if packaging:
++if sys.implementation.name == 'graalpy':
++    run_setup(False)
++elif packaging:
+     run_setup(True)
+ else:
+     try:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[[rules]]`
	`2`	`+patch = 'rapidfuzz.patch'`