Skip to content
Open
Changes from all commits
Commits
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
36 changes: 19 additions & 17 deletions src/alfred/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,25 @@ def __init__(self, process, capture_stream: Optional[IO] = None, output_stream:
def _run_capture(self):
if self.capture_stream is not None:
while True:
line = self.capture_stream.readline().decode('utf-8')

if line != '' and self.stream is True:
try:
self.output_stream.write(line)
self.output_stream.flush()
except UnicodeEncodeError:
# Encoding error happens on windows because the terminal is not utf-8 by default
#
# encodings\cp1252.py", line 19, in encode
# return codecs.charmap_encode(input,self.errors,encoding_table)[0]
# UnicodeEncodeError: 'charmap' codec can't encode character '\u2713' in position 5
line = line.encode('ascii', errors='replace').decode('ascii')
self.output_stream.write(line)
self.output_stream.flush()

if line != '':
line_bytes = self.capture_stream.readline()
if line_bytes != b'':
line = line_bytes.decode('utf-8')
if self.stream is True:
try:

self.output_stream.write(line)
self.output_stream.flush()
except UnicodeEncodeError:
# Encoding error happens on windows because the terminal is not utf-8 by default
#
# encodings\cp1252.py", line 19, in encode
# return codecs.charmap_encode(input,self.errors,encoding_table)[0]
# UnicodeEncodeError: 'charmap' codec can't encode character '\u2713' in position 5
line = line.encode('ascii', errors='replace').decode('ascii')
self.output_stream.write(line)
self.output_stream.flush()


self.capture_logs.append(line)

if self.subprocess.poll() is not None:
Expand Down