Fix output.safe_write() in connection with NamedTemporaryFile

Fixes: AttributeError: '_io.BufferedRandom' object has no attribute 'buffer'

osc/output/output.py

@@ -143,9 +143,15 @@ def safe_write(file: TextIO, text: Union[str, bytes], *, add_newline: bool = Fal
     """
     text = sanitize_text(text)
     if isinstance(text, bytes):
-        file.buffer.write(text)
+        if hasattr(file, "buffer"):
-        if add_newline:
+            file.buffer.write(text)
-            file.buffer.write(os.linesep.encode("utf-8"))
+            if add_newline:
+                file.buffer.write(os.linesep.encode("utf-8"))
+        else:
+            # file has no "buffer" attribute, let's try to write the bytes directly
+            file.write(text)
+            if add_newline:
+                file.write(os.linesep.encode("utf-8"))
     else:
         file.write(text)
         if add_newline:
@@ -174,7 +180,8 @@ def run_pager(message: Union[bytes, str], tmp_suffix: str = ""):
         safe_write(sys.stdout, message)
         return
 
-    with tempfile.NamedTemporaryFile(suffix=tmp_suffix) as tmpfile:
+    mode = "w+b" if isinstance(message, bytes) else "w+"
+    with tempfile.NamedTemporaryFile(mode=mode, suffix=tmp_suffix) as tmpfile:
         safe_write(tmpfile, message)
         tmpfile.flush()
 

tests/test_output.py

@@ -1,10 +1,12 @@
 import contextlib
 import io
+import tempfile
 import unittest
 
 import osc.conf
 from osc.output import KeyValueTable
 from osc.output import print_msg
+from osc.output import safe_write
 from osc.output import sanitize_text
 from osc.output import tty
 
@@ -238,5 +240,23 @@ class TestSanitization(unittest.TestCase):
         self.assertEqual(sanitized, b"0;this is the window title")
 
 
+class TestSafeWrite(unittest.TestCase):
+    def test_string_to_file(self):
+        with tempfile.NamedTemporaryFile(mode="w+") as f:
+            safe_write(f, "string")
+
+    def test_bytes_to_file(self):
+        with tempfile.NamedTemporaryFile(mode="wb+") as f:
+            safe_write(f, b"bytes")
+
+    def test_string_to_stringio(self):
+        with io.StringIO() as f:
+            safe_write(f, "string")
+
+    def test_bytes_to_bytesio(self):
+        with io.BytesIO() as f:
+            safe_write(f, b"bytes")
+
+
 if __name__ == "__main__":
     unittest.main()