This repository was archived by the owner on Jul 11, 2022. It is now read-only.
python3 compat, hasattr iteritems->items #113
Merged
Conversation
This file contains hidden or 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
kbroughton
changed the title
Signed-off-by: kbroughton <[email protected]>
yurishkuro
reviewed
Jan 14, 2018
| @@ -82,7 +82,7 @@ def inject(self, span_context, carrier): | |||
| carrier[header_key] = encoded_value | |||
|
|
|||
| def extract(self, carrier): | |||
| if not hasattr(carrier, 'iteritems'): | |||
| if not hasattr(carrier, 'items'): | |||
There was a problem hiding this comment.
I am not able to find the reason why this code was checking for iteritems instead of isinstance(carrier, dict) as done in the inject method, but I seem to recall there was a reason for it, i.e. a type was passed in some cases that wasn't a true dict but allowed iteritems (with there was a unit test).
yurishkuro
approved these changes
Jan 14, 2018
Closed
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.
I'm not sure what data structures this test was for, but for python3 it fails because dict has no iteritems. Changes were made around it for six.iteritems, but this change was missed.
Once i made this change (and another PR to django_opentracing), i was able to run django_opentracing on django python3