Implement bytearray.decode

coolreader18 · coolreader18 · commit d5b0965479b2 · 2020-04-08T12:16:19.000-05:00
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -10,15 +10,15 @@ use super::objbyteinner::{
 use super::objint::PyIntRef;
 use super::objiter;
 use super::objslice::PySliceRef;
-use super::objstr::PyStringRef;
+use super::objstr::{PyString, PyStringRef};
 use super::objtuple::PyTupleRef;
 use super::objtype::PyClassRef;
 use crate::cformat::CFormatString;
 use crate::function::OptionalArg;
 use crate::obj::objstr::do_cformat_string;
 use crate::pyobject::{
     Either, PyClassImpl, PyComparisonValue, PyContext, PyIterable, PyObjectRef, PyRef, PyResult,
-    PyValue, TryFromObject,
+    PyValue, TryFromObject, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 use std::mem::size_of;
@@ -590,6 +590,26 @@ impl PyByteArray {
         self.inner.borrow_mut().elements.reverse();
         Ok(())
     }
+
+    #[pymethod]
+    fn decode(
+        zelf: PyRef<Self>,
+        encoding: OptionalArg<PyStringRef>,
+        errors: OptionalArg<PyStringRef>,
+        vm: &VirtualMachine,
+    ) -> PyResult<PyStringRef> {
+        let encoding = encoding.into_option();
+        vm.decode(zelf.into_object(), encoding.clone(), errors.into_option())?
+            .downcast::<PyString>()
+            .map_err(|obj| {
+                vm.new_type_error(format!(
+                    "'{}' decoder returned '{}' instead of 'str'; use codecs.encode() to \
+                     encode arbitrary types",
+                    encoding.as_ref().map_or("utf-8", |s| s.as_str()),
+                    obj.class().name,
+                ))
+            })
+    }
 }
 
 // fn set_value(obj: &PyObjectRef, value: Vec<u8>) {
