Merge pull request RustPython#1559 from vazrupe/fix-bytes

Fix panic when using non-collection in bytes()

Author: windelbouwman

tests/snippets/basic_types.py

@@ -34,10 +34,11 @@
 b = bytes([1, 2, 3])
 assert a == b
 
-try:
+with assert_raises(TypeError):
     bytes([object()])
-except TypeError:
-    pass
+
+with assert_raises(TypeError):
+    bytes(1.0)
 
 with assert_raises(ValueError):
     bytes(-1)

vm/src/obj/objbyteinner.rs

@@ -105,13 +105,13 @@ impl ByteInnerNewOptions {
                     obj => {
                         let elements = vm.extract_elements(&obj).or_else(|_| {
                             Err(vm.new_type_error(format!(
-                                "cannot convert {} object to bytes",
+                                "cannot convert '{}' object to bytes",
                                 obj.class().name
                             )))
                         });
 
                         let mut data_bytes = vec![];
-                        for elem in elements.unwrap() {
+                        for elem in elements? {
                             let v = objint::to_int(vm, &elem, &BigInt::from(10))?;
                             if let Some(i) = v.to_u8() {
                                 data_bytes.push(i);