Add DirEntry.{name, path}

palaviv · palaviv · commit 858a6d03b097 · 2019-04-21T11:42:57.000+03:00
diff --git a/tests/snippets/stdlib_os.py b/tests/snippets/stdlib_os.py
@@ -56,6 +56,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
 
 FILE_NAME = "test1"
+FILE_NAME2 = "test2"
 CONTENT = b"testing"
 CONTENT2 = b"rustpython"
 CONTENT3 = b"BOYA"
@@ -73,3 +74,16 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 	assert os.read(fd, len(CONTENT2)) == CONTENT2
 	assert os.read(fd, len(CONTENT3)) == CONTENT3
 	os.close(fd)
+
+
+	fname2 = tmpdir + os.sep + FILE_NAME2
+	with open(fname2, "wb"):
+		pass
+	files = set()
+	paths = set()
+	for dir_entry in os.scandir(tmpdir):
+		files.add(dir_entry.name)
+		paths.add(dir_entry.path)
+
+	assert files == set([FILE_NAME, FILE_NAME2])
+	assert paths == set([fname, fname2])
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -210,6 +210,10 @@ impl DirEntryRef {
     fn name(self, _vm: &VirtualMachine) -> String {
         self.entry.file_name().into_string().unwrap()
     }
+
+    fn path(self, _vm: &VirtualMachine) -> String {
+        self.entry.path().to_str().unwrap().to_string()
+    }
 }
 
 #[derive(Debug)]
@@ -269,7 +273,8 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     });
 
     let dir_entry = py_class!(ctx, "DirEntry", ctx.object(), {
-         "name" => ctx.new_rustfunc(DirEntryRef::name),
+         "name" => ctx.new_property(DirEntryRef::name),
+         "path" => ctx.new_property(DirEntryRef::path),
     });
 
     py_module!(vm, "_os", {
