Skip to content

out.py: prefer stderr and remove isatty() restriction #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2019
Merged

out.py: prefer stderr and remove isatty() restriction #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b536d
out.py: switch .info() and .note() to use stderr
jnsnow Aug 29, 2019
79ac893
out.py: relax tty restriction for stdout messages
jnsnow Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions stgit/out.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ def __init__(self, file=None):
sys.stderr.fileno(), 'w', buffering=1, encoding='utf-8'
)
)
if file or sys.stdout.isatty():
self.__out = self.__stdout
else:
self.__out = Output(None)
self.__out = self.__stdout

def stdout(self, line):
"""Write a line to stdout."""
Expand All @@ -127,10 +124,10 @@ def err_bytes(self, byte_data):

def info(self, *msgs):
for msg in msgs:
self.__out.single_line(msg)
self.__stderr.single_line(msg)

def note(self, *msgs, **kw):
self.__out.tagged_lines(kw.get('title', 'Notice'), msgs)
self.__stderr.tagged_lines(kw.get('title', 'Notice'), msgs)

def warn(self, *msgs, **kw):
self.__stderr.tagged_lines(kw.get('title', 'Warning'), msgs)
Expand Down