implement dir for ByObjectRef (RustPython#5088)

dannasman · web-flow · commit 830389f62c96 · 2023-10-09T15:16:38.000+09:00
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -1,4 +1,4 @@
-use super::{PyDict, PyDictRef, PyList, PyStr, PyStrRef, PyType, PyTypeRef};
+use super::{PyDictRef, PyList, PyStr, PyStrRef, PyType, PyTypeRef};
 use crate::common::hash::PyHash;
 use crate::{
     class::PyClassImpl,
@@ -252,22 +252,7 @@ impl PyBaseObject {
 
     #[pymethod(magic)]
     pub fn dir(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyList> {
-        let attributes = obj.class().get_attributes();
-
-        let dict = PyDict::from_attributes(attributes, vm)?.into_ref(&vm.ctx);
-
-        // Get instance attributes:
-        if let Some(object_dict) = obj.dict() {
-            vm.call_method(
-                dict.as_object(),
-                identifier!(vm, update).as_str(),
-                (object_dict,),
-            )?;
-        }
-
-        let attributes: Vec<_> = dict.into_iter().map(|(k, _v)| k).collect();
-
-        Ok(PyList::from(attributes))
+        obj.dir(vm)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -3,14 +3,15 @@
 
 use crate::{
     builtins::{
-        pystr::AsPyStr, PyBytes, PyDict, PyDictRef, PyGenericAlias, PyInt, PyStr, PyStrRef,
+        pystr::AsPyStr, PyBytes, PyDict, PyDictRef, PyGenericAlias, PyInt, PyList, PyStr, PyStrRef,
         PyTuple, PyTupleRef, PyType, PyTypeRef,
     },
     bytesinner::ByteInnerNewOptions,
     common::{hash::PyHash, str::to_ascii},
     convert::{ToPyObject, ToPyResult},
     dictdatatype::DictKey,
     function::{Either, OptionalArg, PyArithmeticValue, PySetterValue},
+    object::PyPayload,
     protocol::{PyIter, PyMapping, PySequence},
     types::{Constructor, PyComparisonOp},
     AsObject, Py, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
@@ -62,6 +63,23 @@ impl PyObjectRef {
     }
 
     // PyObject *PyObject_Dir(PyObject *o)
+    pub fn dir(self, vm: &VirtualMachine) -> PyResult<PyList> {
+        let attributes = self.class().get_attributes();
+
+        let dict = PyDict::from_attributes(attributes, vm)?.into_ref(&vm.ctx);
+
+        if let Some(object_dict) = self.dict() {
+            vm.call_method(
+                dict.as_object(),
+                identifier!(vm, update).as_str(),
+                (object_dict,),
+            )?;
+        }
+
+        let attributes: Vec<_> = dict.into_iter().map(|(k, _v)| k).collect();
+
+        Ok(PyList::from(attributes))
+    }
 }
 
 impl PyObject {
