Skip to content

Remove more Python 2.6 code#1430

Merged
sethmlarson merged 7 commits intourllib3:masterfrom
pquentin:remove-more-py26
Aug 24, 2018
Merged

Remove more Python 2.6 code#1430
sethmlarson merged 7 commits intourllib3:masterfrom
pquentin:remove-more-py26

Conversation

@pquentin
Copy link
Copy Markdown
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.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 24, 2018 •
edited
Loading

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
Copy Markdown
Member Author

pquentin commented Aug 24, 2018 •
edited
Loading

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

@pquentin
Copy link
Copy Markdown
Member Author

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
@sethmlarson sethmlarson merged commit a6c11c1 into urllib3:master Aug 24, 2018
@sethmlarson
Copy link
Copy Markdown
Member

sethmlarson commented Aug 24, 2018

Thanks @pquentin! 🎉

@sethmlarson sethmlarson mentioned this pull request Aug 24, 2018
Merged
@pquentin pquentin deleted the remove-more-py26 branch September 2, 2018 16:18
@speedplane
Copy link
Copy Markdown

speedplane commented Dec 19, 2018 •
edited
Loading

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
Copy Markdown
Member Author

pquentin commented Dec 19, 2018

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

@speedplane speedplane mentioned this pull request Dec 19, 2018
Closed
speedplane added a commit to speedplane/urllib3 that referenced this pull request Dec 19, 2018
@speedplane
App Engine does not have _tunnel_host set in its httplib implementati…
3c813db 
…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
@speedplane
App Engine does not have _tunnel_host set in its httplib implementati…
ae7f612 
…on. Make sure we check for that. urllib3#1503. Not this reverts part of the change in urllib3#1430.
@speedplane speedplane mentioned this pull request Dec 19, 2018
Closed
This was referenced Mar 9, 2021
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Mar 13, 2021
Closed
Closed
Closed
Merged
Closed
Closed
Merged
Closed
Dobatymo pushed a commit to Dobatymo/urllib3 that referenced this pull request Mar 16, 2022
@pquentin @sethmlarson
Remove more Python 2.6 code (urllib3#1430)
b2e34d2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sethmlarson sethmlarson sethmlarson approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pquentin @codecov-io @sethmlarson @speedplane