mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 08:56:13 +01:00
Code

Modernize output.run_pager()

Browse Source
This commit is contained in:
Daniel Mach 2024-04-16 16:31:27 +02:00
parent 861a362622
commit d2503fbf49
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osc/output/output.py
View File

@ -170,17 +170,12 @@ def run_pager(message: Union[bytes, str], tmp_suffix: str = ""):
if not message:
return
if not sys.stdout.isatty():
if isinstance(message, str):
print(message)
else:
sys.stdout.buffer.write(message)
else:
tmpfile = tempfile.NamedTemporaryFile(suffix=tmp_suffix)
if isinstance(message, str):
tmpfile.write(bytes(message, 'utf-8'))
else:
tmpfile.write(message)
if not tty.IS_INTERACTIVE:
safe_write(sys.stdout, message)
return
with tempfile.NamedTemporaryFile(suffix=tmp_suffix) as tmpfile:
safe_write(tmpfile, message)
tmpfile.flush()
env = os.environ.copy()
@ -195,7 +190,4 @@ def run_pager(message: Union[bytes, str], tmp_suffix: str = ""):
env["LESS"] = less_opts
cmd = shlex.split(pager) + [tmpfile.name]
try:
run_external(*cmd, env=env)
finally:
tmpfile.close()