ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

psrp - fix unicode handling in Python 2 (#47461)

Browse source 
* psrp - fix unicode handling in Python 2

* skip psrp become test when on Server 2008
This commit is contained in:
Jordan Borean 2018-10-24 05:37:05 +10:00 • committed by GitHub
parent 94eab56d51
commit f28b7c7ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 89 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/ansible/plugins/connection/psrp.py
View file

@ -553,26 +553,24 @@ if ($bytes_read -gt 0) {
# TODO: figure out a better way of merging this with the host output
stdout_list = []
for output in pipeline.output:
# not all pipeline outputs can be casted to a string, we will
# create our own output based on the properties if that is the
# case+
try:
output_msg = str(output)
except TypeError:
if isinstance(output, GenericComplexObject):
obj_lines = output.property_sets
for key, value in output.adapted_properties.items():
obj_lines.append("%s: %s" % (key, value))
for key, value in output.extended_properties.items():
obj_lines.append("%s: %s" % (key, value))
output_msg = "\n".join(obj_lines)
else:
output_msg = ""
# Not all pipeline outputs are a string or contain a __str__ value,
# we will create our own output based on the properties of the
# complex object if that is the case.
if isinstance(output, GenericComplexObject) and output.to_string is None:
obj_lines = output.property_sets
for key, value in output.adapted_properties.items():
obj_lines.append(u"%s: %s" % (key, value))
for key, value in output.extended_properties.items():
obj_lines.append(u"%s: %s" % (key, value))
output_msg = u"\n".join(obj_lines)
else:
output_msg = to_text(output, nonstring='simplerepr')
stdout_list.append(output_msg)
stdout = "\r\n".join(stdout_list)
stdout = u"\r\n".join(stdout_list)
if len(self.host.ui.stdout) > 0:
stdout += "\r\n" + "".join(self.host.ui.stdout)
stdout += u"\r\n" + u"".join(self.host.ui.stdout)
stderr_list = []
for error in pipeline.streams.error:
@ -604,4 +602,4 @@ if ($bytes_read -gt 0) {
self.host.ui.stdout = []
self.host.ui.stderr = []
return rc, stdout, stderr
return rc, to_bytes(stdout, encoding='utf-8'), to_bytes(stderr, encoding='utf-8')