[GR-18235] [GR-18238] Call __index__ in appropriate conversion functions

PullRequest: graalpython/882

Author: msimacek

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -132,6 +132,12 @@ def __int__(self):
         return 0xCAFE
 
 
+class DummyIndexable():
+
+    def __index__(self):
+        return 0xCAFE
+
+
 class DummyIntSubclass(int):
 
     def __int__(self):
@@ -201,6 +207,7 @@ def _default_unarop_args():
         (0xffffffffffffffffffffffffffffffff,),
         (DummyIntable(),),
         (DummyIntSubclass(),),
+        (DummyIndexable(), ),
         (NoNumber(),),
         (DummyFloatable(),),
         (DummyFloatSubclass(),),

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -103,6 +103,15 @@ def __int__(self):
         return 0xBABE
 
 
+class DummyIndexable:
+
+    def __int__(self):
+        return 0xDEAD
+
+    def __index__(self):
+        return 0xBEEF
+
+
 class TestPyLong(CPyExtTestCase):
 
     def compile_module(self, name):
@@ -119,6 +128,7 @@ def compile_module(self, name):
             (DummyIntable(), 0xCAFE),
             (DummyIntSubclass(), 0xBABE),
             (DummyNonInt(), -1),
+            (DummyIndexable(), 0xBEEF if sys.version_info >= (3, 8, 0) else 0xDEAD),
         ),
         code='''int wrap_PyLong_AsLong(PyObject* obj, long expected) {
             long res = PyLong_AsLong(obj);

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -54,6 +54,14 @@ def _reference_typecheck(args, expected_type):
     return args[0][0]
 
 
+class Indexable:
+    def __int__(self):
+        return 456
+
+    def __index__(self):
+        return 123
+
+
 class TestModsupport(CPyExtTestCase):
     def compile_module(self, name):
         type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
@@ -206,6 +214,7 @@ def compile_module(self, name):
             ((0xFFFFFFFFFFFFFFFF, ), 0xFFFFFFFF),
             # will be a big one
             ((0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, ), 0xFFFFFFFF),
+            ((Indexable(), ), 123 if sys.version_info > (3, 8, 0) else 456),
         ),
         code='''
         static unsigned int wrap_PyArg_ParseTuple(PyObject* argTuple, PyObject* expected) {

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

@@ -36,7 +36,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-
+import sys
 import unittest
 from math import atan2
 
@@ -143,6 +143,14 @@ class CP2(complex):
         def __complex__(self):
             return 42j
 
+    class CP3:
+        def __float__(self):
+            return 6.0
+
+    class CP4:
+        def __index__(self):
+            return 123
+
     assert CP1(1+4j) == complex(1, 4)
 
     c = CP2(1+4j)
@@ -240,6 +248,9 @@ def __complex__(self):
     assert c == complex(-7, 49)
     assert type(c) == CP2
 
+    assert complex(CP3()) == complex(6.0)
+    if sys.version_info >= (3, 8, 0):
+        assert complex(CP4()) == complex(123)
 
 class ComplexTest(unittest.TestCase):
 

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -99,7 +99,12 @@ def test_create(self):
         class Obj:
             def __float__(self):
                 return 1.123
+        class Indexable:
+            def __index__(self):
+                return 4
         assert [float(x) for x in [Obj(), b"0.123"]] == [1.123, 0.123]
+        if sys.version_info >= (3, 8, 0):
+            assert float(Indexable()) == 4.0
 
         assert float(99) == 99
         assert float(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999) == 1e+132

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -95,6 +95,10 @@ class SubInt(int):
         def __int__(self):
             return 0xBADF00D
 
+    class Indexable:
+        def __index__(self):
+            return 4
+
     class NoInt():
         pass
 
@@ -108,6 +112,9 @@ class NoInt():
         assert False, "converting non-integer to integer must not be possible"
     except BaseException as e:
         assert type(e) == TypeError, "expected type error, was: %r" % type(e)
+    if sys.version_info >= (3, 8, 0):
+        assert int(Indexable()) == 4
+
 
 def test_int_bit_length():
     assert (int(0)).bit_length() == 0