saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve handling of non-ascii characters in terminal output. (Fixes: #49523)

Browse source
This commit is contained in:
Michael Lustfield 2018-10-20 06:24:49 -05:00 • committed by rallytime
parent 9331f1e920
commit 601a5b83fc
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/vt.py
View file

@ -53,6 +53,7 @@ except ImportError:
# Import salt libs
import salt.utils.crypt
import salt.utils.data
import salt.utils.stringutils
from salt.ext.six import string_types
from salt.log.setup import LOG_LEVELS
@ -685,7 +686,7 @@ class Terminal(object):
stdout = None
else:
if self.stream_stdout:
self.stream_stdout.write(stdout)
self.stream_stdout.write(salt.utils.data.encode(stdout))
self.stream_stdout.flush()
if self.stdout_logger:
@ -703,7 +704,7 @@ class Terminal(object):
if self.child_fd is not None:
fcntl.fcntl(self.child_fd, fcntl.F_SETFL, fd_flags)
# <---- Process STDOUT -------------------------------------------
return stdout, stderr
return salt.utils.data.encode(stdout), salt.utils.data.encode(stderr)
def __detect_parent_terminal_size(self):
try: