Skip to content

Fix test_io on windows #6387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Dec 10, 2025
Merged

Fix test_io on windows #6387

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e7a746
mark skip on test_io
youknowone Dec 9, 2025
9d4d350
Drop for FileIO
youknowone Dec 9, 2025
98bed0a
IO Desctructors
youknowone Dec 9, 2025
de11481
Iterator
youknowone Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
IO Desctructors
  • Loading branch information
@youknowone
youknowone committed Dec 10, 2025
commit 98bed0a7bb8e2be702ca61d797b8efc5cac08d8c
82 changes: 77 additions & 5 deletions crates/vm/src/stdlib/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,11 +1753,23 @@ mod _io {
}

#[pyclass(
with(Constructor, BufferedMixin, BufferedReadable),
with(Constructor, BufferedMixin, BufferedReadable, Destructor),
flags(BASETYPE, HAS_DICT)
)]
impl BufferedReader {}

impl Destructor for BufferedReader {
fn slot_del(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(zelf, "close", ());
Ok(())
}

#[cold]
fn del(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> {
unreachable!("slot_del is implemented")
}
}

impl DefaultConstructor for BufferedReader {}

#[pyclass]
Expand Down Expand Up @@ -1810,11 +1822,23 @@ mod _io {
}

#[pyclass(
with(Constructor, BufferedMixin, BufferedWritable),
with(Constructor, BufferedMixin, BufferedWritable, Destructor),
flags(BASETYPE, HAS_DICT)
)]
impl BufferedWriter {}

impl Destructor for BufferedWriter {
fn slot_del(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(zelf, "close", ());
Ok(())
}

#[cold]
fn del(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> {
unreachable!("slot_del is implemented")
}
}

impl DefaultConstructor for BufferedWriter {}

#[pyattr]
Expand Down Expand Up @@ -1852,11 +1876,29 @@ mod _io {
}

#[pyclass(
with(Constructor, BufferedMixin, BufferedReadable, BufferedWritable),
with(
Constructor,
BufferedMixin,
BufferedReadable,
BufferedWritable,
Destructor
),
flags(BASETYPE, HAS_DICT)
)]
impl BufferedRandom {}

impl Destructor for BufferedRandom {
fn slot_del(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(zelf, "close", ());
Ok(())
}

#[cold]
fn del(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> {
unreachable!("slot_del is implemented")
}
}

impl DefaultConstructor for BufferedRandom {}

#[pyattr]
Expand Down Expand Up @@ -1900,7 +1942,13 @@ mod _io {
}

#[pyclass(
with(Constructor, Initializer, BufferedReadable, BufferedWritable),
with(
Constructor,
Initializer,
BufferedReadable,
BufferedWritable,
Destructor
),
flags(BASETYPE, HAS_DICT)
)]
impl BufferedRWPair {
Expand Down Expand Up @@ -1942,6 +1990,18 @@ mod _io {
}
}

impl Destructor for BufferedRWPair {
fn slot_del(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(zelf, "close", ());
Ok(())
}

#[cold]
fn del(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> {
unreachable!("slot_del is implemented")
}
}

#[derive(FromArgs)]
struct TextIOWrapperArgs {
#[pyarg(any, default)]
Expand Down Expand Up @@ -2413,7 +2473,7 @@ mod _io {
vm.call_method(&textio.buffer, "flush", ())
}

#[pyclass(with(Constructor, Initializer), flags(BASETYPE))]
#[pyclass(with(Constructor, Initializer, Destructor), flags(BASETYPE))]
impl TextIOWrapper {
#[pymethod]
fn reconfigure(&self, args: TextIOWrapperArgs, vm: &VirtualMachine) -> PyResult<()> {
Expand Down Expand Up @@ -3276,6 +3336,18 @@ mod _io {
}
}

impl Destructor for TextIOWrapper {
fn slot_del(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(zelf, "close", ());
Ok(())
}

#[cold]
fn del(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> {
unreachable!("slot_del is implemented")
}
}

#[pyattr]
#[pyclass(name)]
#[derive(Debug, PyPayload, Default)]
Expand Down