Merge branch 'master' into Add-set-funcs3

Author: windelbouwman

tests/snippets/set.py

@@ -68,3 +68,18 @@ def __hash__(self):
 
 assert set([1,2,3]) ^ set([4,5]) == set([1,2,3,4,5])
 assert set([1,2,3]) ^ set([1,2,3,4,5]) == set([4,5])
+
+try:
+	set([[]])
+except TypeError:
+	pass
+else:
+	assert False, "TypeError was not raised"
+
+try:
+	set().add([])
+except TypeError:
+	pass
+else:
+	assert False, "TypeError was not raised"
+

vm/src/obj/objset.rs

@@ -133,7 +133,7 @@ fn set_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
             let mut elements = HashMap::new();
             let iterator = objiter::get_iter(vm, iterable)?;
             while let Ok(v) = vm.call_method(&iterator, "__next__", vec![]) {
-                insert_into_set(vm, &mut elements, &v).unwrap();
+                insert_into_set(vm, &mut elements, &v)?;
             }
             elements
         }