Merge pull request RustPython#818 from RustPython/dir_str_bug

cthulahoops · web-flow · commit 785854ac9eb1 · 2019-04-12T15:26:49.000+01:00
Fix dir bug - not including object attributes correctly.
diff --git a/tests/snippets/builtin_dir.py b/tests/snippets/builtin_dir.py
@@ -8,6 +8,9 @@ def test():
 assert "test" in dir(a), "test not in a"
 assert "test" in dir(A), "test not in A"
 
+a.x = 3
+assert "x" in dir(a), "x not in a"
+
 class B(A):
 	def __dir__(self):
 		return ('q', 'h')
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -239,6 +239,19 @@ impl PyDictRef {
         attrs
     }
 
+    pub fn from_attributes(attrs: PyAttributes, vm: &VirtualMachine) -> PyResult<Self> {
+        let dict = DictContentType::default();
+        let entries = RefCell::new(dict);
+
+        for (key, value) in attrs {
+            entries
+                .borrow_mut()
+                .insert(vm, &vm.ctx.new_str(key), value)?;
+        }
+
+        Ok(PyDict { entries }.into_ref(vm))
+    }
+
     fn hash(self, vm: &VirtualMachine) -> PyResult {
         Err(vm.new_type_error("unhashable type".to_string()))
     }
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
@@ -117,13 +117,22 @@ fn object_repr(zelf: PyObjectRef, _vm: &VirtualMachine) -> String {
     format!("<{} object at 0x{:x}>", zelf.class().name, zelf.get_id())
 }
 
-pub fn object_dir(obj: PyObjectRef, vm: &VirtualMachine) -> PyList {
-    let attributes = get_attributes(&obj);
-    let attributes: Vec<PyObjectRef> = attributes
-        .keys()
-        .map(|k| vm.ctx.new_str(k.to_string()))
-        .collect();
-    PyList::from(attributes)
+pub fn object_dir(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyList> {
+    let attributes: PyAttributes = objtype::get_attributes(obj.class());
+
+    let dict = PyDictRef::from_attributes(attributes, vm)?;
+
+    // Get instance attributes:
+    if let Some(object_dict) = &obj.dict {
+        vm.invoke(
+            vm.get_attribute(dict.clone().into_object(), "update")?,
+            object_dict.clone().into_object(),
+        )?;
+    }
+
+    let attributes: Vec<_> = dict.into_iter().map(|(k, _v)| k.clone()).collect();
+
+    Ok(PyList::from(attributes))
 }
 
 fn object_format(
@@ -230,17 +239,3 @@ fn object_getattr(
         Ok(None)
     }
 }
-
-pub fn get_attributes(obj: &PyObjectRef) -> PyAttributes {
-    // Get class attributes:
-    let mut attributes = objtype::get_attributes(obj.class());
-
-    // Get instance attributes:
-    if let Some(dict) = &obj.dict {
-        for (key, value) in dict {
-            attributes.insert(key.to_string(), value.clone());
-        }
-    }
-
-    attributes
-}
