io.TextIoWrapper.reconfigure to always flush (#7281)

ShaharNaveh · web-flow · commit ca390dc5fb61 · 2026-03-02T01:03:44.000+09:00
* Always flush on reconfigure (io.TextWrapper)

* Add test
diff --git a/crates/vm/src/stdlib/io.rs b/crates/vm/src/stdlib/io.rs
@@ -3029,7 +3029,6 @@ mod _io {
             let mut newline_changed = false;
             let mut line_buffering = None;
             let mut write_through = None;
-            let mut flush_on_reconfigure = false;
 
             if let Some(enc) = args.encoding {
                 if enc.as_str().contains('\0') && enc.as_str().starts_with("locale") {
@@ -3056,11 +3055,9 @@ mod _io {
             }
 
             if let OptionalArg::Present(Some(value)) = args.line_buffering {
-                flush_on_reconfigure = true;
                 line_buffering = Some(Self::bool_from_index(value, vm)?);
             }
             if let OptionalArg::Present(Some(value)) = args.write_through {
-                flush_on_reconfigure = true;
                 write_through = Some(Self::bool_from_index(value, vm)?);
             }
 
@@ -3077,12 +3074,10 @@ mod _io {
                 ));
             }
 
-            if flush_on_reconfigure {
-                if data.pending.num_bytes > 0 {
-                    data.write_pending(vm)?;
-                }
-                vm.call_method(&data.buffer, "flush", ())?;
+            if data.pending.num_bytes > 0 {
+                data.write_pending(vm)?;
             }
+            vm.call_method(&data.buffer, "flush", ())?;
 
             if encoding_changed || errors_changed || newline_changed {
                 if data.pending.num_bytes > 0 {
diff --git a/extra_tests/snippets/stdlib_io.py b/extra_tests/snippets/stdlib_io.py
@@ -1,5 +1,5 @@
 import os
-from io import BufferedReader, BytesIO, FileIO, RawIOBase, StringIO
+from io import BufferedReader, BytesIO, FileIO, RawIOBase, StringIO, TextIOWrapper
 
 from testutils import assert_raises
 
@@ -58,3 +58,29 @@ def readinto(self, b):
 
 with assert_raises(ValueError):
     f.isatty()
+
+
+class Gh6588:
+    def __init__(self):
+        self.textio = None
+        self.closed = False
+
+    def writable(self):
+        return True
+
+    def readable(self):
+        return False
+
+    def seekable(self):
+        return False
+
+    def write(self, data):
+        self.textio.reconfigure(encoding="utf-8")
+        return len(data)
+
+
+raw = Gh6588()
+textio = TextIOWrapper(raw, encoding="utf-8", write_through=True)
+raw.textio = textio
+with assert_raises(AttributeError):
+    textio.writelines(["x"])

Original file line number	Diff line number	Diff line change
`@@ -3029,7 +3029,6 @@ mod _io {`
`3029`	`3029`	`let mut newline_changed = false;`
`3030`	`3030`	`let mut line_buffering = None;`
`3031`	`3031`	`let mut write_through = None;`
`3032`		`- let mut flush_on_reconfigure = false;`
`3033`	`3032`
`3034`	`3033`	`if let Some(enc) = args.encoding {`
`3035`	`3034`	`if enc.as_str().contains('\0') && enc.as_str().starts_with("locale") {`
`@@ -3056,11 +3055,9 @@ mod _io {`
`3056`	`3055`	`}`
`3057`	`3056`
`3058`	`3057`	`if let OptionalArg::Present(Some(value)) = args.line_buffering {`
`3059`		`- flush_on_reconfigure = true;`
`3060`	`3058`	`line_buffering = Some(Self::bool_from_index(value, vm)?);`
`3061`	`3059`	`}`
`3062`	`3060`	`if let OptionalArg::Present(Some(value)) = args.write_through {`
`3063`		`- flush_on_reconfigure = true;`
`3064`	`3061`	`write_through = Some(Self::bool_from_index(value, vm)?);`
`3065`	`3062`	`}`
`3066`	`3063`
`@@ -3077,12 +3074,10 @@ mod _io {`
`3077`	`3074`	`));`
`3078`	`3075`	`}`
`3079`	`3076`
`3080`		`- if flush_on_reconfigure {`
`3081`		`- if data.pending.num_bytes > 0 {`
`3082`		`- data.write_pending(vm)?;`
`3083`		`- }`
`3084`		`- vm.call_method(&data.buffer, "flush", ())?;`
	`3077`	`+ if data.pending.num_bytes > 0 {`
	`3078`	`+ data.write_pending(vm)?;`
`3085`	`3079`	`}`
	`3080`	`+ vm.call_method(&data.buffer, "flush", ())?;`
`3086`	`3081`
`3087`	`3082`	`if encoding_changed \|\| errors_changed \|\| newline_changed {`
`3088`	`3083`	`if data.pending.num_bytes > 0 {`