Fixed python 3 incompatibility in logging API implemenation of findCaller #5058
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
pull-request-size
bot
added
the
size/M
35 tasks
m4dcoder
approved these changes
Oct 14, 2020
cognifloyd
requested changes
Oct 14, 2020
|
@nmaludy Looks like there's an issue starting sensor container. The integration test in travis is failing consistently on both PRs. |
Co-authored-by: Jacob Floyd <[email protected]>
|
@cognifloyd good catch, i had the right line numbers in the description of this PR, but must have had a bad copy/paste in the code itself. @m4dcoder i re-ran the integration tests and they passed (i just committed @cognifloyd change so we'll see how they run this time), also note that i tested sensors explicitly since that is what @punkrokk reported and they definitely worked on my systems (centos7, centos8, ubuntu18) |
|
@nmaludy @cognifloyd LGTM Thanks guys! |
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.
Closes #5057
See that issue for description of what the problem was. The fix was simply to ensure our implementation handles both the python 2 version and returns a 3-tuple, along with the python 3 version which returns a 4-tuple and is based on the code here: https://github.com/python/cpython/blob/3.9/Lib/logging/__init__.py#L1502-L1536
I've tested this change both my a python 2.7 (centos7) and python 3.6 (centos8 and ubuntu18) box and the logging modules are returned properly.