Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove more Python 2.6 code #1430

Merged
merged 7 commits into from Aug 24, 2018
Merged

Conversation

@pquentin
Copy link
Member

@pquentin pquentin commented Aug 24, 2018

This also fixes an installation error of gcp-devrel-py-tools==0.0.15, see GoogleCloudPlatform/python-repo-tools#23 for details. I can separate that in two PRs if needed.

pquentin added 6 commits Aug 24, 2018
See #1422 for details.
@codecov-io
Copy link

@codecov-io codecov-io commented Aug 24, 2018

Codecov Report

Merging #1430 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1430   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files          21      21           
  Lines        1790    1790           
======================================
  Hits         1790    1790
Impacted Files Coverage Δ
src/urllib3/connectionpool.py 100% <ø> (ø) ⬆️
src/urllib3/connection.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cb21598...5a8ab59. Read the comment docs.

@pquentin
Copy link
Member Author

@pquentin pquentin commented Aug 24, 2018

Added two possible Windows errors in test_client_no_intermediate, per #1422 (comment).

@pquentin
Copy link
Member Author

@pquentin pquentin commented Aug 24, 2018

It looks like this job failed due to a timeout in Travis itself: https://travis-ci.org/urllib3/urllib3/jobs/420006959.

@pquentin pquentin closed this Aug 24, 2018
@pquentin pquentin reopened this Aug 24, 2018
@pquentin pquentin force-pushed the pquentin:remove-more-py26 branch from 0187386 to 5a8ab59 Aug 24, 2018
@sethmlarson sethmlarson merged commit a6c11c1 into urllib3:master Aug 24, 2018
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@sethmlarson
Copy link
Member

@sethmlarson sethmlarson commented Aug 24, 2018

Thanks @pquentin! 🎉

@pquentin pquentin deleted the pquentin:remove-more-py26 branch Sep 2, 2018
@speedplane
Copy link

@speedplane speedplane commented Dec 19, 2018

This broke urllib3 on Google App Engine, which also doesn't have _tunnel_host in its implementation of httplib. The if getattr(self, '_tunnel_host', None): part should go back in.

Below is a stacktrace of the error. Note that this is pure urllib3, no requests are being used.

Traceback (most recent call last):
  ...
  File "/project/updater/search_backend.py", line 1353, in setup
    "/_alias/%s"%self.index_name)
  File "/project/libs/elasticsearch_five/transport.py", line 312, in perform_request
    status, headers, data = connection.perform_request(method, url, params, body, ignore=ignore, timeout=timeout)
  File "/project/libs/elasticsearch_five/connection/http_urllib3.py", line 114, in perform_request
    response = self.pool.urlopen(method, url, body, retries=False, headers=self.headers, **kw)
  File "/project/libs/urllib3/connectionpool.py", line 600, in urlopen
    chunked=chunked)
  File "/project/libs/urllib3/connectionpool.py", line 343, in _make_request
    self._validate_conn(conn)
  File "/project/libs/urllib3/connectionpool.py", line 839, in _validate_conn
    conn.connect()
  File "/project/libs/urllib3/connection.py", line 304, in connect
    if self._tunnel_host:
AttributeError: 'VerifiedHTTPSConnection' object has no attribute '_tunnel_host'
@pquentin
Copy link
Member Author

@pquentin pquentin commented Dec 19, 2018

Oh. Can you please open a pull request to fix that? Thanks!

speedplane added a commit to speedplane/urllib3 that referenced this pull request Dec 19, 2018
…on. Make sure we check for that. urllib3#1503. Not this reverts part of the change in urllib3#1430.
speedplane added a commit to speedplane/urllib3 that referenced this pull request Dec 19, 2018
…on. Make sure we check for that. urllib3#1503. Not this reverts part of the change in urllib3#1430.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.