Fix a bug with bytes in py3 #13
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
garrettheel
force-pushed
the
fix-py3-bytes
branch
2 times, most recently
from
91711c0 to
58434a6
Compare
rowillia
reviewed
Dec 7, 2017
tests/unit/kmsauth/kmsauth_test.py
Outdated
| kms_mock = MagicMock() | ||
| kms_mock.encrypt = MagicMock( | ||
| return_value={'CiphertextBlob': 'encrypted'} | ||
| return_value={'CiphertextBlob': six.b('encrypted')} |
There was a problem hiding this comment.
No need for syx.b here, just prefix with b
garrettheel
force-pushed
the
fix-py3-bytes
branch
from
58434a6 to
7d242bf
Compare
asottile
reviewed
Dec 8, 2017
kmsauth/__init__.py
Outdated
| PY2 = sys.version[0] == '2' | ||
|
|
||
|
|
||
| def ensure_str(str_or_bytes, encoding='utf-8'): |
There was a problem hiding this comment.
ensure_textis a better name for this- why not
errorsparameter here as well?
tests/unit/kmsauth/kmsauth_test.py
Outdated
| import datetime | ||
| import json | ||
|
|
||
| import six |
asottile
reviewed
Dec 8, 2017
kmsauth/__init__.py
Outdated
|
|
||
| TOKEN_SKEW = 3 | ||
| TIME_FORMAT = "%Y%m%dT%H%M%SZ" | ||
| PY2 = sys.version[0] == '2' |
asottile
approved these changes
Dec 8, 2017
ryan-lane
approved these changes
Dec 11, 2017
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.
No description provided.