psrp - fix unicode handling in Python 2 #47461
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @jborean93, thank you for submitting this pull-request! |
ansibot
added
affects_2.8
jborean93
force-pushed
the
psrp-utf8
branch
5 times, most recently
from
ca3962f
to
88e894a
Compare
ansibot
added
core_review
ansibot
added
needs_revision
ansibot
added
core_review
dagwieers
approved these changes
Oct 23, 2018
abadger
reviewed
Oct 23, 2018
| # 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: |
There was a problem hiding this comment.
If .to_string() exists, do we have to call that explicitly?
There was a problem hiding this comment.
(Also, is this the way to check for to_string? I don't know the API so I don't know if it really creates the attribute but sets it to None or if it omits the attribute altogether.)
There was a problem hiding this comment.
to_string always exists, it's just set to None by default https://github.com/jborean93/pypsrp/blob/master/pypsrp/complex_objects.py#L109. It will get populated if the <ToString></ToString> element is populated on the XML being deserialized from the server. In the first case, to_string is None so we need to manually build the string representation from the properties otherwise we just call str() which works for a GenericComplexObject as well as any other non generic ComplexObjects.
jborean93
added a commit
to jborean93/ansible
that referenced
this pull request
Oct 23, 2018
* psrp - fix unicode handling in Python 2 * skip psrp become test when on Server 2008 (cherry picked from commit f28b7c7)
|
Backport PR stable-2.7 #47530 |
abadger
pushed a commit
that referenced
this pull request
Oct 24, 2018
* psrp - fix unicode handling in Python 2 * skip psrp become test when on Server 2008 (cherry picked from commit f28b7c7)
Tomorrow9
pushed a commit
to Tomorrow9/ansible
that referenced
this pull request
Dec 4, 2018
* psrp - fix unicode handling in Python 2 * skip psrp become test when on Server 2008
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Further fix of #46998. This first checks if the type is a GenericComplexObject without a ToString entry and then uses to_text after that. This test also returns the output as a byte string which is what is expected for exec_command in the connection plugin.
Lastly adds some custom psrp only tests to test these situations that are unique for PSRP.
ISSUE TYPE
COMPONENT NAME
psrp
ANSIBLE VERSION