Ensuring response from httplib2 is treated as str in Python 2 and bytes in Python3 #724
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
googlebot
added
the
cla: yes
| @@ -256,7 +256,7 @@ def api_request(self, method, path, query_params=None, | |||
| content_type = response.get('content-type', '') | |||
| if not content_type.startswith('application/json'): | |||
| raise TypeError('Expected JSON, got %s' % content_type) | |||
| return json.loads(content) | |||
| return json.loads(content.decode('utf-8')) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
…nnection.api_request is decoded to a string before being passed to json.loads
…o use six.binary_type
…intention clearer
craigloftus
force-pushed
the
python3_support_improvements
branch
from
a66cb5c
to
62e13d7
Compare
dhermes
added a commit
to dhermes/google-cloud-python
that referenced
this pull request
Mar 24, 2015
- Incorporates changes from googleapis#724. - Also requires httplib2 from HEAD since the bytes/unicode header issues have not been released on PyPI yet.
dhermes
added a commit
to dhermes/google-cloud-python
that referenced
this pull request
Mar 24, 2015
- Incorporates changes from googleapis#724. - Also requires httplib2 from HEAD since the bytes/unicode header issues have not been released on PyPI yet.
Merged
|
@craigloftus Thanks for doing this work. I have incorporated it into #756 to keep this from bit-rotting too much as we make more updates to master. Please re-open or comment if you have any issues with this. |
|
@dhermes No worries. I learnt a lot and look forward to no longer depending on my fork. |
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.
When using Python 3
httplib2returns response content asbytes, but the content isstrin Python 2. This causes problems when passing the content tojson.loads, which requiresstralways.Tests were passing previously because they were mocking the response by
httplib2as astr. These tests have been changed to use thebnotation, which resolves tostrin Python 2 andbytesin Python 3.This is the follow-up from PR #697.