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.
So I switched the CLI off of six to use botocore's version of six.
There is an interesting scenario for our vendored version of six where if you do something like:
It will try to pull it from the six installed from dateutil which is a dependency of botocore. So, avoid doing that style of importing modules and functions from the vendored six.
Instead, we need to be explicit in how we import modules from six. Currently, something like this is totally fine:
But this is not:
If you ever want to do it of the style of the second one refer to the compat.py file and add the import there if it is not located there. So, In the new format, if you want to import
shlex_quote
, you would add it to compat.py and do:I did my best to try to catch all of them. But, I may have missed some. I expect I missed a few in botocore. So if you run across one please fix it in both botocore and the cli.
cc @jamesls @danielgtaylor