memoryview

OddCoincidence · OddCoincidence · commit 776dd805919a · 2019-03-09T14:58:33.000-08:00
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -1,12 +1,28 @@
-use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
+use crate::pyobject::{
+    PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectPayload2, PyObjectRef, PyResult,
+    TypeProtocol,
+};
 use crate::vm::VirtualMachine;
 
+#[derive(Debug)]
+pub struct PyMemoryView {
+    obj: PyObjectRef,
+}
+
+impl PyObjectPayload2 for PyMemoryView {
+    fn required_type(ctx: &PyContext) -> PyObjectRef {
+        ctx.memoryview_type()
+    }
+}
+
 pub fn new_memory_view(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(cls, None), (bytes_object, None)]);
     vm.ctx.set_attr(&cls, "obj", bytes_object.clone());
     Ok(PyObject::new(
-        PyObjectPayload::MemoryView {
-            obj: bytes_object.clone(),
+        PyObjectPayload::AnyRustValue {
+            value: Box::new(PyMemoryView {
+                obj: bytes_object.clone(),
+            }),
         },
         cls.clone(),
     ))
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1490,9 +1490,6 @@ pub enum PyObjectPayload {
         stop: Option<BigInt>,
         step: Option<BigInt>,
     },
-    MemoryView {
-        obj: PyObjectRef,
-    },
     WeakRef {
         referent: PyObjectWeakRef,
     },
@@ -1526,7 +1523,6 @@ impl PyObjectPayload2 for PyIteratorValue {
 impl fmt::Debug for PyObjectPayload {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            PyObjectPayload::MemoryView { ref obj } => write!(f, "bytes/bytearray {:?}", obj),
             PyObjectPayload::WeakRef { .. } => write!(f, "weakref"),
             PyObjectPayload::Slice { .. } => write!(f, "slice"),
             PyObjectPayload::AnyRustValue { value } => value.fmt(f),
