Merge pull request RustPython#1231 from yjhmelody/fix_int_fn

windelbouwman · web-flow · commit 7fd01b06437d · 2019-08-12T19:52:25.000+02:00
fix int fn
diff --git a/tests/snippets/ints.py b/tests/snippets/ints.py
@@ -90,6 +90,10 @@
 assert int("101", 2) == 5
 assert int("101", base=2) == 5
 assert int(1) == 1
+assert int(' 1') == 1
+assert int('1 ') == 1
+assert int(' 1 ') == 1
+assert int('10', base=0) == 10
 
 assert int.from_bytes(b'\x00\x10', 'big') == 16
 assert int.from_bytes(b'\x00\x10', 'little') == 4096
@@ -103,6 +107,13 @@
 assert (2147483647).to_bytes(8, 'big', signed=False) == b'\x00\x00\x00\x00\x7f\xff\xff\xff'
 assert (-2147483648).to_bytes(8, 'little', signed=True) == b'\x00\x00\x00\x80\xff\xff\xff\xff'
 
+with assertRaises(ValueError):
+    # check base first
+    int(' 1 ', base=1)
+
+with assertRaises(ValueError):
+    int(' 1 ', base=37)
+
 with assertRaises(TypeError):
     int(base=2)
 
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -6,6 +6,7 @@ use num_traits::{One, Pow, Signed, ToPrimitive, Zero};
 
 use crate::format::FormatSpec;
 use crate::function::{KwArgs, OptionalArg, PyFuncArgs};
+use crate::obj::objtype::PyClassRef;
 use crate::pyhash;
 use crate::pyobject::{
     IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
@@ -17,7 +18,6 @@ use super::objbyteinner::PyByteInner;
 use super::objbytes::PyBytes;
 use super::objstr::{PyString, PyStringRef};
 use super::objtype;
-use crate::obj::objtype::PyClassRef;
 
 /// int(x=0) -> integer
 /// int(x, base=10) -> integer
@@ -667,10 +667,16 @@ fn int_new(cls: PyClassRef, options: IntOptions, vm: &VirtualMachine) -> PyResul
 }
 
 // Casting function:
-pub fn to_int(vm: &VirtualMachine, obj: &PyObjectRef, base: u32) -> PyResult<BigInt> {
+pub fn to_int(vm: &VirtualMachine, obj: &PyObjectRef, mut base: u32) -> PyResult<BigInt> {
+    if base == 0 {
+        base = 10
+    } else if base < 2 || base > 36 {
+        return Err(vm.new_value_error("int() base must be >= 2 and <= 36, or 0".to_string()));
+    }
+
     match_class!(obj.clone(),
         s @ PyString => {
-            i32::from_str_radix(s.as_str(), base)
+            i32::from_str_radix(s.as_str().trim(), base)
                 .map(BigInt::from)
                 .map_err(|_|vm.new_value_error(format!(
                     "invalid literal for int() with base {}: '{}'",
