[GR-23218] Make test_descr pass - test_special_method_lookup.

PullRequest: graalpython/1317

Author: tomasstupka

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

@@ -722,6 +722,34 @@ def test_bytes_mod():
         raised = True
     assert raised
 
+def test__bytes__():
+    class C: pass
+    setattr(C, "__bytes__", bytes)
+    assert bytes(C()) == b''
+
+    class C(int): pass
+    setattr(C, "__bytes__", bytes)
+    assert bytes(C()) == b''
+    assert bytes(C(1)) == b''
+    
+    setattr(C, "__bytes__", complex)
+    raised = False
+    try:
+        bytes(C(1))
+    except(TypeError):
+        raised = True
+    assert raised    
+
+    def b(o):
+        return b'abc'
+
+    class BA(bytearray): pass
+    setattr(BA, "__bytes__", b)
+    assert bytes(BA(b'cde')) == b'abc'
+
+    class BAA(BA): pass
+    assert bytes(BAA(b'cde')) == b'abc'
+        
 class BaseLikeBytes:
 
     def test_maketrans(self):

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

@@ -85,6 +85,47 @@ def test___round__(self):
             pass
         else:
             assert False, "rounding with a float should have raised"
+            
+        class F: 
+            pass
+
+        setattr(F, "__round__", round)
+        try:
+            round(F())
+        except TypeError:
+            pass
+        else:
+            assert False, "rounding with a non-float should have raised"
+            
+        class F(float): 
+            pass
+
+        setattr(F, "__round__", round)
+        try:
+            round(F(4.2))
+        except TypeError:
+            pass
+        else:
+            assert False, "rounding with only 1 arg should have raised"
+        
+        round(F(4.2), 1)
+
+        def r(o):
+            return(42)
+
+        setattr(F, "__round__", r)
+        assert round(F(4.2)) == 42
+
+        l = []
+        def r(arg1, arg2):
+            l.append(arg1)
+            l.append(arg2)
+            return(42)
+
+        setattr(F, "__round__", r)
+        assert round(F(4.2), 2) == 42
+        assert l[0] == 4.2
+        assert l[1] == 2
 
     def test_magic_rounding(self):
         class C():

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt

@@ -77,6 +77,7 @@
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slots_multiple_inheritance
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slots_special2
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slots_trash
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_special_method_lookup
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_special_unbound_method_types
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_specials
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_staticmethods

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncWith01.tast

@@ -39,16 +39,11 @@ ModuleRootNode Name: <module 'asyncWith01'> SourceSection: [0,34]`async def f():
                           EmptyNode SourceSection: [30,34]`pass`
                         IntegerLiteralNode SourceSection: [27,28]`1`
                           Value: 1
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        CallNodeGen SourceSection: None
-                        CallNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        CachedDispatchFirst SourceSection: None
+                        CallUnaryMethodNodeGen SourceSection: None
+                        CallQuaternaryMethodNodeGen SourceSection: None
                         YesNodeGen SourceSection: None
                           IsBuiltinClassProfile SourceSection: None
                             CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AwaitAndAsyncTests/asyncWith02.tast

@@ -45,16 +45,11 @@ ModuleRootNode Name: <module 'asyncWith02'> SourceSection: [0,47]`async def f():
                           ReadGlobalOrBuiltinNodeGen SourceSection: [35,36]`c`
                             Identifier: c
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
-                          LookupInheritedAttributeNode SourceSection: None
-                            LookupAttributeInMRONodeGen SourceSection: None
-                              IsSameTypeNodeGen SourceSection: None
-                            CachedDispatchFirst SourceSection: None
-                          LookupInheritedAttributeNode SourceSection: None
-                            LookupAttributeInMRONodeGen SourceSection: None
-                              IsSameTypeNodeGen SourceSection: None
-                            CachedDispatchFirst SourceSection: None
-                          CallNodeGen SourceSection: None
-                          CallNodeGen SourceSection: None
+                          LookupSpecialMethodNodeGen SourceSection: None
+                          LookupSpecialMethodNodeGen SourceSection: None
+                          CachedDispatchFirst SourceSection: None
+                          CallUnaryMethodNodeGen SourceSection: None
+                          CallQuaternaryMethodNodeGen SourceSection: None
                           YesNodeGen SourceSection: None
                             IsBuiltinClassProfile SourceSection: None
                               CachedDispatchFirst SourceSection: None
@@ -66,16 +61,11 @@ ModuleRootNode Name: <module 'asyncWith02'> SourceSection: [0,47]`async def f():
                         ReadGlobalOrBuiltinNodeGen SourceSection: [27,28]`a`
                           Identifier: a
                           ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        CallNodeGen SourceSection: None
-                        CallNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        CachedDispatchFirst SourceSection: None
+                        CallUnaryMethodNodeGen SourceSection: None
+                        CallQuaternaryMethodNodeGen SourceSection: None
                         YesNodeGen SourceSection: None
                           IsBuiltinClassProfile SourceSection: None
                             CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with01.tast

@@ -20,16 +20,11 @@ ModuleRootNode Name: <module 'with01'> SourceSection: [0,21]`with A() as a:↵
               Identifier: A
               IsBuiltinClassProfile SourceSection: None
                 CachedDispatchFirst SourceSection: None
-          LookupInheritedAttributeNode SourceSection: None
-            LookupAttributeInMRONodeGen SourceSection: None
-              IsSameTypeNodeGen SourceSection: None
-            CachedDispatchFirst SourceSection: None
-          LookupInheritedAttributeNode SourceSection: None
-            LookupAttributeInMRONodeGen SourceSection: None
-              IsSameTypeNodeGen SourceSection: None
-            CachedDispatchFirst SourceSection: None
-          CallNodeGen SourceSection: None
-          CallNodeGen SourceSection: None
+          LookupSpecialMethodNodeGen SourceSection: None
+          LookupSpecialMethodNodeGen SourceSection: None
+          CachedDispatchFirst SourceSection: None
+          CallUnaryMethodNodeGen SourceSection: None
+          CallQuaternaryMethodNodeGen SourceSection: None
           YesNodeGen SourceSection: None
             IsBuiltinClassProfile SourceSection: None
               CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with02.tast

@@ -21,16 +21,11 @@ ModuleRootNode Name: <module 'with02'> SourceSection: [0,31]`with A() as a, B()
                 Identifier: B
                 IsBuiltinClassProfile SourceSection: None
                   CachedDispatchFirst SourceSection: None
-            LookupInheritedAttributeNode SourceSection: None
-              LookupAttributeInMRONodeGen SourceSection: None
-                IsSameTypeNodeGen SourceSection: None
-              CachedDispatchFirst SourceSection: None
-            LookupInheritedAttributeNode SourceSection: None
-              LookupAttributeInMRONodeGen SourceSection: None
-                IsSameTypeNodeGen SourceSection: None
-              CachedDispatchFirst SourceSection: None
-            CallNodeGen SourceSection: None
-            CallNodeGen SourceSection: None
+            LookupSpecialMethodNodeGen SourceSection: None
+            LookupSpecialMethodNodeGen SourceSection: None
+            CachedDispatchFirst SourceSection: None
+            CallUnaryMethodNodeGen SourceSection: None
+            CallQuaternaryMethodNodeGen SourceSection: None
             YesNodeGen SourceSection: None
               IsBuiltinClassProfile SourceSection: None
                 CachedDispatchFirst SourceSection: None
@@ -43,16 +38,11 @@ ModuleRootNode Name: <module 'with02'> SourceSection: [0,31]`with A() as a, B()
               Identifier: A
               IsBuiltinClassProfile SourceSection: None
                 CachedDispatchFirst SourceSection: None
-          LookupInheritedAttributeNode SourceSection: None
-            LookupAttributeInMRONodeGen SourceSection: None
-              IsSameTypeNodeGen SourceSection: None
-            CachedDispatchFirst SourceSection: None
-          LookupInheritedAttributeNode SourceSection: None
-            LookupAttributeInMRONodeGen SourceSection: None
-              IsSameTypeNodeGen SourceSection: None
-            CachedDispatchFirst SourceSection: None
-          CallNodeGen SourceSection: None
-          CallNodeGen SourceSection: None
+          LookupSpecialMethodNodeGen SourceSection: None
+          LookupSpecialMethodNodeGen SourceSection: None
+          CachedDispatchFirst SourceSection: None
+          CallUnaryMethodNodeGen SourceSection: None
+          CallQuaternaryMethodNodeGen SourceSection: None
           YesNodeGen SourceSection: None
             IsBuiltinClassProfile SourceSection: None
               CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with03.tast

@@ -46,16 +46,11 @@ ModuleRootNode Name: <module 'with03'> SourceSection: [0,35]`def fn():↵  with
                           ReadGlobalOrBuiltinNodeGen SourceSection: [17,18]`A`
                             Identifier: A
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        CallNodeGen SourceSection: None
-                        CallNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        CachedDispatchFirst SourceSection: None
+                        CallUnaryMethodNodeGen SourceSection: None
+                        CallQuaternaryMethodNodeGen SourceSection: None
                         YesNodeGen SourceSection: None
                           IsBuiltinClassProfile SourceSection: None
                             CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with04.tast

@@ -47,16 +47,11 @@ ModuleRootNode Name: <module 'with04'> SourceSection: [0,45]`def fn():↵  with
                             ReadGlobalOrBuiltinNodeGen SourceSection: [27,28]`B`
                               Identifier: B
                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
-                          LookupInheritedAttributeNode SourceSection: None
-                            LookupAttributeInMRONodeGen SourceSection: None
-                              IsSameTypeNodeGen SourceSection: None
-                            CachedDispatchFirst SourceSection: None
-                          LookupInheritedAttributeNode SourceSection: None
-                            LookupAttributeInMRONodeGen SourceSection: None
-                              IsSameTypeNodeGen SourceSection: None
-                            CachedDispatchFirst SourceSection: None
-                          CallNodeGen SourceSection: None
-                          CallNodeGen SourceSection: None
+                          LookupSpecialMethodNodeGen SourceSection: None
+                          LookupSpecialMethodNodeGen SourceSection: None
+                          CachedDispatchFirst SourceSection: None
+                          CallUnaryMethodNodeGen SourceSection: None
+                          CallQuaternaryMethodNodeGen SourceSection: None
                           YesNodeGen SourceSection: None
                             IsBuiltinClassProfile SourceSection: None
                               CachedDispatchFirst SourceSection: None
@@ -70,16 +65,11 @@ ModuleRootNode Name: <module 'with04'> SourceSection: [0,45]`def fn():↵  with
                           ReadGlobalOrBuiltinNodeGen SourceSection: [17,18]`A`
                             Identifier: A
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        CallNodeGen SourceSection: None
-                        CallNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        CachedDispatchFirst SourceSection: None
+                        CallUnaryMethodNodeGen SourceSection: None
+                        CallQuaternaryMethodNodeGen SourceSection: None
                         YesNodeGen SourceSection: None
                           IsBuiltinClassProfile SourceSection: None
                             CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/with05.tast

@@ -43,16 +43,11 @@ ModuleRootNode Name: <module 'with05'> SourceSection: [0,36]`def fn():↵  with
                             Identifier: open
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                           StringLiteralNode SourceSection: [22,25]`'x'`
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        LookupInheritedAttributeNode SourceSection: None
-                          LookupAttributeInMRONodeGen SourceSection: None
-                            IsSameTypeNodeGen SourceSection: None
-                          CachedDispatchFirst SourceSection: None
-                        CallNodeGen SourceSection: None
-                        CallNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        LookupSpecialMethodNodeGen SourceSection: None
+                        CachedDispatchFirst SourceSection: None
+                        CallUnaryMethodNodeGen SourceSection: None
+                        CallQuaternaryMethodNodeGen SourceSection: None
                         YesNodeGen SourceSection: None
                           IsBuiltinClassProfile SourceSection: None
                             CachedDispatchFirst SourceSection: None