Merge pull request #51151 from Ch3LL/bp_51061

Backport #51061 to 2018.3
This commit is contained in:
Daniel Wozniak 2019-01-11 20:18:44 -07:00 committed by GitHub
commit f7a100c6e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -686,7 +686,7 @@ class Terminal(object):
stdout = None
else:
if self.stream_stdout:
self.stream_stdout.write(salt.utils.data.encode(stdout))
self.stream_stdout.write(salt.utils.stringutils.to_str(stdout))
self.stream_stdout.flush()
if self.stdout_logger: