Fix: allow index-like objects as base in int constructor

Author: fangerer

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

@@ -336,7 +336,17 @@ def __int__(self):
     assert int(SpecInt0()) == 0
 
 def test_create_int_from_string():
-  assert int("5c7920a80f5261a2e5322163c79b71a25a41f414", 16) == 527928385865769069253929759180846776123316630548
+    assert int("5c7920a80f5261a2e5322163c79b71a25a41f414", 16) == 527928385865769069253929759180846776123316630548
+    class IndexLike:
+        def __index__(self):
+            return 16
+    assert int("123ff", IndexLike()) == 0x123ff
+    try:
+        int("123ff", None)
+    except TypeError:
+        assert True
+    else:
+        assert False, "expected TypeError"
 
 
 class FromBytesTests(unittest.TestCase):

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -989,11 +989,6 @@ private Object toIntInternal(Object number, Object base) {
             }
         }
 
-        private Object toInt(LazyPythonClass cls, Object number) {
-            Object value = toIntInternal(number);
-            return convertToIntInternal(cls, value, number, 10);
-        }
-
         private Object toInt(LazyPythonClass cls, Object number, int base) {
             Object value = toIntInternal(number, base);
             return convertToIntInternal(cls, value, number, base);
@@ -1226,13 +1221,19 @@ Object parsePIntError(LazyPythonClass cls, String number, int base) {
             }
         }
 
-        @Specialization
-        public Object createInt(LazyPythonClass cls, String number, Object keywordArg) {
-            if (keywordArg instanceof PNone) {
-                return toInt(cls, number);
-            } else {
-                CompilerDirectives.transferToInterpreter();
-                throw new RuntimeException("Not implemented integer with base: " + keywordArg);
+        @Specialization(guards = "!isNoValue(base)", rewriteOn = NumberFormatException.class)
+        public Object parsePIntWithBaseObject(LazyPythonClass cls, String number, Object base,
+                        @Cached CastToIndexNode castToIndexNode) {
+            return toInt(cls, number, castToIndexNode.execute(base));
+        }
+
+        @Specialization(guards = "!isNoValue(base)", replaces = "parsePIntWithBaseObject")
+        public Object createIntError(LazyPythonClass cls, String number, Object base,
+                        @Cached CastToIndexNode castToIndexNode) {
+            try {
+                return toInt(cls, number, castToIndexNode.execute(base));
+            } catch (NumberFormatException e) {
+                throw raise(ValueError, "invalid literal for int() with base %s: %s", base, number);
             }
         }