mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-06 21:28:42 +02:00
Code Activity

Fix output.safe_write() in connection with NamedTemporaryFile

Browse Source 
Fixes: AttributeError: '_io.BufferedRandom' object has no attribute 'buffer'
This commit is contained in:
Daniel Mach
2024-04-16 16:50:10 +02:00
parent d2503fbf49
commit d1111e23a1
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osc/output/output.py
View File

@@ -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 add_newline:
file.buffer.write(os.linesep.encode("utf-8"))
if hasattr(file, "buffer"):
file.buffer.write(text)
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()