fix input

Author: youknowone

crates/vm/src/py_io.rs

@@ -70,11 +70,14 @@ pub fn file_readline(obj: &PyObject, size: Option<usize>, vm: &VirtualMachine) -
     };
     let ret = match_class!(match ret {
         s @ PyStr => {
-            let s_val = s.as_str();
-            if s_val.is_empty() {
+            // Use as_wtf8() to handle strings with surrogates (e.g., surrogateescape)
+            let s_wtf8 = s.as_wtf8();
+            if s_wtf8.is_empty() {
                 return Err(eof_err());
             }
-            if let Some(no_nl) = s_val.strip_suffix('\n') {
+            // '\n' is ASCII, so we can check bytes directly
+            if s_wtf8.as_bytes().last() == Some(&b'\n') {
+                let no_nl = &s_wtf8[..s_wtf8.len() - 1];
                 vm.ctx.new_str(no_nl).into()
             } else {
                 s.into()

crates/vm/src/stdlib/builtins.rs

@@ -7,8 +7,6 @@ pub use builtins::{ascii, print, reversed};
 
 #[pymodule]
 mod builtins {
-    use std::io::IsTerminal;
-
     use crate::{
         AsObject, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
         builtins::{
@@ -27,7 +25,6 @@ mod builtins {
         },
         protocol::{PyIter, PyIterReturn},
         py_io,
-        readline::{Readline, ReadlineResult},
         stdlib::sys,
         types::PyComparisonOp,
     };
@@ -470,36 +467,12 @@ mod builtins {
 
         let _ = vm.call_method(&stderr, "flush", ());
 
-        let fd_matches = |obj, expected| {
-            vm.call_method(obj, "fileno", ())
-                .and_then(|o| i64::try_from_object(vm, o))
-                .is_ok_and(|fd| fd == expected)
-        };
-
-        // everything is normal, we can just rely on rustyline to use stdin/stdout
-        if fd_matches(&stdin, 0) && fd_matches(&stdout, 1) && std::io::stdin().is_terminal() {
-            let prompt = prompt.as_ref().map_or("", |s| s.as_str());
-            let mut readline = Readline::new(());
-            match readline.readline(prompt) {
-                ReadlineResult::Line(s) => Ok(vm.ctx.new_str(s).into()),
-                ReadlineResult::Eof => {
-                    Err(vm.new_exception_empty(vm.ctx.exceptions.eof_error.to_owned()))
-                }
-                ReadlineResult::Interrupt => {
-                    Err(vm.new_exception_empty(vm.ctx.exceptions.keyboard_interrupt.to_owned()))
-                }
-                ReadlineResult::Io(e) => Err(vm.new_os_error(e.to_string())),
-                #[cfg(unix)]
-                ReadlineResult::OsError(num) => Err(vm.new_os_error(num.to_string())),
-                ReadlineResult::Other(e) => Err(vm.new_runtime_error(e.to_string())),
-            }
-        } else {
-            if let OptionalArg::Present(prompt) = prompt {
-                vm.call_method(&stdout, "write", (prompt,))?;
-            }
-            let _ = vm.call_method(&stdout, "flush", ());
-            py_io::file_readline(&stdin, None, vm)
+        // Use simple stdin readline (like fgets).
+        if let OptionalArg::Present(prompt) = prompt {
+            vm.call_method(&stdout, "write", (prompt,))?;
         }
+        let _ = vm.call_method(&stdout, "flush", ());
+        py_io::file_readline(&stdin, None, vm)
     }
 
     #[pyfunction]