Fix string repr in int invalid literal error

coolreader18 · coolreader18 · commit bc535ddde197 · 2020-04-27T15:08:10.000-05:00
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
@@ -479,8 +479,6 @@ def __trunc__(self):
         self.assertEqual(n, 1)
         self.assertIs(type(n), IntSubclass)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_error_message(self):
         def check(s, base=None):
             with self.assertRaises(ValueError,
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -11,7 +11,7 @@ use super::objbyteinner::PyByteInner;
 use super::objbytes::PyBytes;
 use super::objfloat;
 use super::objmemory::PyMemoryView;
-use super::objstr::{PyString, PyStringRef};
+use super::objstr::{PyString, PyStringRef, PyStringRepr};
 use super::objtype::{self, PyClassRef};
 use crate::exceptions::PyBaseExceptionRef;
 use crate::format::FormatSpec;
@@ -864,8 +864,12 @@ fn detect_base(literal: &str) -> Option<u32> {
 }
 
 fn invalid_literal(vm: &VirtualMachine, literal: &str, base: &BigInt) -> PyBaseExceptionRef {
+    let literal = match PyStringRepr::try_from_str(literal, vm) {
+        Ok(r) => r,
+        Err(e) => return e,
+    };
     vm.new_value_error(format!(
-        "invalid literal for int() with base {}: '{}'",
+        "invalid literal for int() with base {}: {}",
         base, literal
     ))
 }
