restartcheck: fix python 3 bytestring breakage #50757
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
rares-pop
reviewed
Dec 5, 2018
In python 2, bytes is an alias for str and b'foo' == 'foo' so this code used to work, but in python 3 bytes is a separate type, b'foo' != 'foo' so pth.startswith() errors because of the type mismatch: "Passed invalid arguments: startswith first arg must be bytes or a tuple of bytes, not str." Fix this by converting bytes to an unicode string so the code works in both v2 and v3. Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
10ne1
force-pushed
the
dev/aratiu/restartcheck-fix-python3-bytestring
branch
from
a373648 to
9831191
Compare
rares-pop
approved these changes
Dec 5, 2018
dwoz
approved these changes
Dec 5, 2018
garethgreenaway
added a commit
to garethgreenaway/salt
that referenced
this pull request
Sep 19, 2019
dwoz
added a commit
that referenced
this pull request
Dec 15, 2019
[master] Porting #50757 to master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In python 2, bytes is an alias for str and b'foo' == 'foo' so this code
used to work, but in python 3 bytes is a separate type, b'foo' != 'foo'
so pth.startswith() errors because of the type mismatch:
"Passed invalid arguments: startswith first arg must be bytes or a
tuple of bytes, not str."
Fix this by converting bytes to an unicode string so the code works in
both v2 and v3.
Signed-off-by: Ioan-Adrian Ratiu adrian.ratiu@ni.com
What does this PR do?
See above.
What issues does this PR fix or reference?
No github issue: it was found during downstream NILinuxRT testing.
Previous Behavior
Function restartcheck was run only on python 2.
New Behavior
Updated to python 3 and restartcheck broke because of the str/bytes type difference.
Tests written?
No
Commits signed with GPG?
No