Fix: adjust error message for container/iterables

feliwir · feliwir · commit 8f4367b71b32 · 2026-04-08T09:20:33.000+02:00
diff --git a/Lib/test/test_contains.py b/Lib/test/test_contains.py
@@ -16,7 +16,6 @@ def __getitem__(self, n):
         return [self.el][n]
 
 class TestContains(unittest.TestCase):
-    @unittest.expectedFailure  # TODO: RUSTPYTHON; Wrong error message
     def test_common_tests(self):
         a = base_set(1)
         b = myset(1)
diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs
@@ -1095,7 +1095,7 @@ mod _csv {
             }
 
             let row = ArgIterable::try_from_object(vm, row.clone()).map_err(|_e| {
-                new_csv_error(vm, format!("\'{}\' object is not iterable", row.class()))
+                new_csv_error(vm, format!("argument of type \'{}\' is not a container or iterable", row.class()))
             })?;
             let mut first_flag = true;
             for field in row.iter(vm)? {
diff --git a/crates/vm/src/function/protocol.rs b/crates/vm/src/function/protocol.rs
@@ -107,7 +107,7 @@ where
         let cls = obj.class();
         let iter_fn = cls.slots.iter.load();
         if iter_fn.is_none() && !cls.has_attr(identifier!(vm, __getitem__)) {
-            return Err(vm.new_type_error(format!("'{}' object is not iterable", cls.name())));
+            return Err(vm.new_type_error(format!("argument of type \'{}\' is not a container or iterable", cls.name())));
         }
         Ok(Self {
             iterable: obj,
diff --git a/crates/vm/src/protocol/iter.rs b/crates/vm/src/protocol/iter.rs
@@ -140,7 +140,7 @@ impl TryFromObject for PyIter<PyObjectRef> {
             Ok(Self(seq_iter.into_pyobject(vm)))
         } else {
             Err(vm.new_type_error(format!(
-                "'{}' object is not iterable",
+                "argument of type \'{}\' is not a container or iterable",
                 iter_target.class().name()
             )))
         }

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ mod _csv {`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`	`1097`	`let row = ArgIterable::try_from_object(vm, row.clone()).map_err(\|_e\| {`
`1098`		`- new_csv_error(vm, format!("\'{}\' object is not iterable", row.class()))`
	`1098`	`+ new_csv_error(vm, format!("argument of type \'{}\' is not a container or iterable", row.class()))`
`1099`	`1099`	`})?;`
`1100`	`1100`	`let mut first_flag = true;`
`1101`	`1101`	`for field in row.iter(vm)? {`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ where`
`107`	`107`	`let cls = obj.class();`
`108`	`108`	`let iter_fn = cls.slots.iter.load();`
`109`	`109`	`if iter_fn.is_none() && !cls.has_attr(identifier!(vm, __getitem__)) {`
`110`		`- return Err(vm.new_type_error(format!("'{}' object is not iterable", cls.name())));`
	`110`	`+ return Err(vm.new_type_error(format!("argument of type \'{}\' is not a container or iterable", cls.name())));`
`111`	`111`	`}`
`112`	`112`	`Ok(Self {`
`113`	`113`	`iterable: obj,`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ impl TryFromObject for PyIter<PyObjectRef> {`
`140`	`140`	`Ok(Self(seq_iter.into_pyobject(vm)))`
`141`	`141`	`} else {`
`142`	`142`	`Err(vm.new_type_error(format!(`
`143`		`- "'{}' object is not iterable",`
	`143`	`+ "argument of type \'{}\' is not a container or iterable",`
`144`	`144`	`iter_target.class().name()`
`145`	`145`	`)))`
`146`	`146`	`}`