Fix App Engine Tunnel Host #1504
Closed
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
…on. Make sure we check for that. urllib3#1503. Not this reverts part of the change in urllib3#1430.
sigmavirus24
approved these changes
Dec 19, 2018
Codecov Report
@@ Coverage Diff @@
## master #1504 +/- ##
==========================================
- Coverage 66.84% 66.55% -0.29%
==========================================
Files 22 22
Lines 2760 2775 +15
==========================================
+ Hits 1845 1847 +2
- Misses 915 928 +13
Continue to review full report at Codecov.
|
pquentin
reviewed
Dec 19, 2018
| @@ -301,7 +301,8 @@ def connect(self): | |||
| conn = self._new_conn() | |||
| hostname = self.host | |||
|
|
|||
| if self._tunnel_host: | |||
| # Google App Engine's different HTTP lib may not define_tunnel_host. | |||
There was a problem hiding this comment.
I think you need a space after "define": "define _tunnel_host".
sethmlarson
reviewed
Dec 19, 2018
| @@ -171,7 +171,7 @@ def _new_conn(self): | |||
|
|
|||
| def _prepare_conn(self, conn): | |||
| self.sock = conn | |||
| if self._tunnel_host: | |||
| if getattr(self, '_tunnel_host', None): | |||
There was a problem hiding this comment.
This looks fine to me, my only question is how do our tests not catch this?
Also should we add a comment here about why we're using getattr to prevent this issue in the future?
|
@speedplane this PR still has outstanding comments. If you'd still like it merged, please let us know! I'm going to close it for now, though. |
jpevarnek
added a commit
to jpevarnek/urllib3
that referenced
this pull request
Jan 24, 2019
urllib3 removed support for Python versions before 2.7 in a previous pull request, unfortunately, this broke environments that use a different implementation of httplib than the one in Python's standard library as well. This includes Google App Engine's urlfetch-based implementation (https://github.com/GoogleCloudPlatform/python-compat-runtime/blob/master/appengine-compat/exported_appengine_sdk/google/appengine/dist27/gae_override/httplib.py#L362) This pull request is nearly identical to urllib3#1504 which was closed due to its author not responding to comments. Fixes urllib3#1503
jpevarnek
added a commit
to jpevarnek/urllib3
that referenced
this pull request
Jan 24, 2019
urllib3 removed support for Python versions before 2.7 in a previous pull request, unfortunately, this broke environments that use a different implementation of httplib than the one in Python's standard library as well. This includes Google App Engine's urlfetch-based implementation (https://github.com/GoogleCloudPlatform/python-compat-runtime/blob/master/appengine-compat/exported_appengine_sdk/google/appengine/dist27/gae_override/httplib.py#L362) This pull request is nearly identical to urllib3#1504 which was closed due to its author not responding to comments. Fixes urllib3#1503
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.
App Engine does not have _tunnel_host set in its httplib implementation. Make sure we check for that. #1503. Note this reverts part of the change in #1430.