Merge pull request #51387 from chrillux/make-binarydata-output-possible

Make binary data output possible
This commit is contained in:
Thomas S Hatch 2019-02-22 07:53:24 -07:00 committed by GitHub
commit b1f7e85b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -130,9 +130,19 @@ class NestDisplay(object):
elif isinstance(ret, six.string_types):
first_line = True
for line in ret.splitlines():
line_prefix = ' ' * len(prefix) if not first_line else prefix
if isinstance(line, bytes):
out.append(
self.ustring(
indent,
self.YELLOW,
'Not string data',
prefix=line_prefix
)
)
break
if self.strip_colors:
line = salt.output.strip_esc_sequence(line)
line_prefix = ' ' * len(prefix) if not first_line else prefix
out.append(
self.ustring(
indent,