Skip to content

Commit a541b50

Browse files
Merge branch 'master' into Add-set-funcs3
2 parents 49e10ed + 1611aa4 commit a541b50

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

tests/snippets/set.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,18 @@ def __hash__(self):
6868

6969
assert set([1,2,3]) ^ set([4,5]) == set([1,2,3,4,5])
7070
assert set([1,2,3]) ^ set([1,2,3,4,5]) == set([4,5])
71+
72+
try:
73+
set([[]])
74+
except TypeError:
75+
pass
76+
else:
77+
assert False, "TypeError was not raised"
78+
79+
try:
80+
set().add([])
81+
except TypeError:
82+
pass
83+
else:
84+
assert False, "TypeError was not raised"
85+

vm/src/obj/objset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn set_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
133133
let mut elements = HashMap::new();
134134
let iterator = objiter::get_iter(vm, iterable)?;
135135
while let Ok(v) = vm.call_method(&iterator, "__next__", vec![]) {
136-
insert_into_set(vm, &mut elements, &v).unwrap();
136+
insert_into_set(vm, &mut elements, &v)?;
137137
}
138138
elements
139139
}

0 commit comments

Comments
 (0)