migrate oci away from six#812
Open
Uh oh!
There was an error while loading. Please reload this page.
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
done automatically with the following: find src/oci -type f -print | xargs gsed -i 's|six\.iterkeys(kwargs)|kwargs.keys()|g' find src/oci -type f -print | xargs gsed -i 's|six\.iteritems(header_params)|header_params.items()|g' find src/oci -type f -print | xargs gsed -i 's|six\.iteritems(path_params)|path_params.items()|g' find src/oci -type f -print | xargs gsed -i 's|six\.iteritems(query_params)|query_params.items()|g'
done automatically with the following: find src/oci -type f -print | xargs gsed -i 's|six\.string_types|str|g' find src/oci -type f -print | xargs gsed -i 's|six\.binary_type|bytes|g'
done automatically with the following: find src/oci -type f -print | xargs gsed -i '/^from oci._vendor import six$/d'
oracle-contributor-agreementbot added the OCA Verified Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
1 participant
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.
Six library was useful for migration purposes between Python 2 and 3, but since Python 3.6 is the oldest supported at this point, it is no longer necessary (and makes things unnecessary more complex and slower).
This PR removes all uses of the six library (it doesn't remove six vendored by urllib3; that should be IMHO done with urllib3 update).
It's quite a big change, but most of it is scripted with simple
sedreplacements/deletions (mentioned in each commit). Skipping those three large commits, the remaining changes are fairly small.