Fix type() error messages

youknowone · youknowone · commit e5d840bdae55 · 2020-02-01T04:01:51.000+09:00
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
@@ -1168,8 +1168,6 @@ def __prepare__(mcls, name, bases):
         with self.assertRaises(TypeError):
             X = types.new_class("X", (int(), C))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_one_argument_type(self):
         expected_message = 'type.__new__() takes exactly 3 arguments (1 given)'
 
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -131,7 +131,7 @@ impl PyBaseException {
 
     #[pymethod(name = "__str__")]
     fn str(&self, vm: &VirtualMachine) -> PyStringRef {
-        let str_args = exception_args_as_string(vm, self.args(), false);
+        let str_args = exception_args_as_string(vm, self.args(), true);
         match str_args.into_iter().exactly_one() {
             Err(i) if i.len() == 0 => PyString::from("").into_ref(vm),
             Ok(s) => s,
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -261,6 +261,14 @@ impl PyClassRef {
             if args.args.len() != 3 {
                 return Err(vm.new_type_error("type() takes 1 or 3 arguments".to_string()));
             }
+        } else {
+            if args.args.len() != 3 {
+                let msg = format!(
+                    "type.__new__() takes exactly 3 arguments ({} given)",
+                    args.args.len()
+                );
+                return Err(vm.new_type_error(msg));
+            }
         }
 
         let (name, bases, dict): (PyStringRef, PyIterable<PyClassRef>, PyDictRef) =

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,14 @@ impl PyClassRef {`
`261`	`261`	`if args.args.len() != 3 {`
`262`	`262`	`return Err(vm.new_type_error("type() takes 1 or 3 arguments".to_string()));`
`263`	`263`	`}`
	`264`	`+ } else {`
	`265`	`+ if args.args.len() != 3 {`
	`266`	`+ let msg = format!(`
	`267`	`+ "type.__new__() takes exactly 3 arguments ({} given)",`
	`268`	`+ args.args.len()`
	`269`	`+ );`
	`270`	`+ return Err(vm.new_type_error(msg));`
	`271`	`+ }`
`264`	`272`	`}`
`265`	`273`
`266`	`274`	`let (name, bases, dict): (PyStringRef, PyIterable<PyClassRef>, PyDictRef) =`