Try to fix universal write on windows

coolreader18 · coolreader18 · commit c6da4ffcdd6d · 2024-12-03T18:01:44.000-06:00
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
@@ -845,9 +845,7 @@ def test_several_leapyears_in_range(self):
 
 
 def conv(s):
-    # XXX RUSTPYTHON TODO: TextIOWrapper newline translation
-    return s.encode()
-    # return s.replace('\n', os.linesep).encode()
+    return s.replace('\n', os.linesep).encode()
 
 class CommandLineTestCase(unittest.TestCase):
     def run_ok(self, *args):
diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
@@ -725,7 +725,6 @@ def test_bad_params(self):
         with self.assertRaises(ValueError):
             gzip.open(self.filename, "rb", newline="\n")
 
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
     def test_encoding(self):
         # Test non-default encoding.
         uncompressed = data1.decode("ascii") * 50
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -616,8 +616,6 @@ class request_handler(NoLogRequestHandler, CGIHTTPRequestHandler):
         pass
 
     linesep = os.linesep.encode('ascii')
-    # TODO: RUSTPYTHON
-    linesep = b'\n'
 
     def setUp(self):
         BaseTestCase.setUp(self)
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -2750,15 +2750,13 @@ mod _io {
             let data = obj.as_str();
 
             let replace_nl = match textio.newline {
+                Newlines::Lf => Some("\n"),
                 Newlines::Cr => Some("\r"),
                 Newlines::Crlf => Some("\r\n"),
+                Newlines::Universal if cfg!(windows) => Some("\r\n"),
                 _ => None,
             };
-            let has_lf = if replace_nl.is_some() || textio.line_buffering {
-                data.contains('\n')
-            } else {
-                false
-            };
+            let has_lf = (replace_nl.is_some() || textio.line_buffering) && data.contains('\n');
             let flush = textio.line_buffering && (has_lf || data.contains('\r'));
             let chunk = if let Some(replace_nl) = replace_nl {
                 if has_lf {
