use PyStringRef in new

Author: jgirardet

tests/snippets/bytes.py

@@ -9,6 +9,8 @@
 assert bytes("bla", "utf8") == bytes("bla", encoding="utf-8") == b"bla"
 with assertRaises(TypeError):
     bytes("bla")
+with assertRaises(TypeError):
+    bytes("bla", encoding = b"jilj")
 
 assert (
     b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"

vm/src/obj/objbyteinner.rs

@@ -7,7 +7,7 @@ use crate::vm::VirtualMachine;
 
 use crate::pyobject::{PyResult, TypeProtocol};
 
-use crate::obj::objstr::PyString;
+use crate::obj::objstr::{PyString, PyStringRef};
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 
@@ -30,37 +30,30 @@ pub struct PyByteInner {
 }
 
 #[derive(FromArgs)]
-pub struct BytesNewOptions {
+pub struct ByteInnerNewOptions {
     #[pyarg(positional_only, optional = true)]
     val_option: OptionalArg<PyObjectRef>,
     #[pyarg(positional_or_keyword, optional = true)]
-    encoding: OptionalArg<PyObjectRef>,
+    encoding: OptionalArg<PyStringRef>,
 }
 
-impl BytesNewOptions {
+impl ByteInnerNewOptions {
     pub fn get_value(self, vm: &VirtualMachine) -> PyResult<PyByteInner> {
         // First handle bytes(string, encoding[, errors])
         if let OptionalArg::Present(enc) = self.encoding {
             if let OptionalArg::Present(eval) = self.val_option {
                 if let Ok(input) = eval.downcast::<PyString>() {
-                    if let Ok(encoding) = enc.clone().downcast::<PyString>() {
-                        if &encoding.value.to_lowercase() == "utf8"
-                            || &encoding.value.to_lowercase() == "utf-8"
-                        // TODO: different encoding
-                        {
-                            return Ok(PyByteInner {
-                                elements: input.value.as_bytes().to_vec(),
-                            });
-                        } else {
-                            return Err(
-                                vm.new_value_error(format!("unknown encoding: {}", encoding.value)), //should be lookup error
-                            );
-                        }
+                    let encoding = enc.as_str();
+                    if encoding.to_lowercase() == "utf8" || encoding.to_lowercase() == "utf-8"
+                    // TODO: different encoding
+                    {
+                        return Ok(PyByteInner {
+                            elements: input.value.as_bytes().to_vec(),
+                        });
                     } else {
-                        return Err(vm.new_type_error(format!(
-                            "bytes() argument 2 must be str, not {}",
-                            enc.class().name
-                        )));
+                        return Err(
+                            vm.new_value_error(format!("unknown encoding: {}", encoding)), //should be lookup error
+                        );
                     }
                 } else {
                     return Err(vm.new_type_error("encoding without a string argument".to_string()));

vm/src/obj/objbytes.rs

@@ -7,7 +7,7 @@ use std::ops::Deref;
 use crate::function::OptionalArg;
 use crate::pyobject::{PyClassImpl, PyContext, PyIterable, PyObjectRef, PyRef, PyResult, PyValue};
 
-use super::objbyteinner::{BytesNewOptions, PyByteInner};
+use super::objbyteinner::{ByteInnerNewOptions, PyByteInner};
 use super::objiter;
 use super::objslice::PySlice;
 use super::objtype::PyClassRef;
@@ -77,7 +77,7 @@ impl PyBytesRef {
     #[pymethod(name = "__new__")]
     fn bytes_new(
         cls: PyClassRef,
-        options: BytesNewOptions,
+        options: ByteInnerNewOptions,
         vm: &VirtualMachine,
     ) -> PyResult<PyBytesRef> {
         PyBytes {