Fix ResourceWarning on CONNECT with Python < 3.11.4 #3252

graingert · 2023-12-31T17:57:07Z

This PR backports the fix from python/cpython#103472 in 3.11.4 so that the last ignored ResourceWarnings are no longer issued by urllib3

Closes #3374

sethmlarson · 2024-01-09T04:46:15Z

@graingert I would love to avoid bundling the _tunnel() implementation if possible, instead what do you think about a conditional filterwarnings for Python 3.11.3 or earlier so we're ensuring that all future versions continue to not emit those warnings?

graingert · 2024-01-09T10:00:04Z

@sethmlarson but this is a warning emitted for users of urllib3 on 3.10 and I'd like the warning fixed for those people too

…3-11-4

pquentin

Thanks! LGTM.

This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [urllib3](https://redirect.github.com/urllib3/urllib3) ([changelog](https://redirect.github.com/urllib3/urllib3/blob/main/CHANGES.rst)) | `==2.2.2` -> `==2.2.3` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/urllib3/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/urllib3/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/urllib3/2.2.2/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/urllib3/2.2.2/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>urllib3/urllib3 (urllib3)</summary> ### [`v2.2.3`](https://redirect.github.com/urllib3/urllib3/blob/HEAD/CHANGES.rst#223-2024-09-12) [Compare Source](https://redirect.github.com/urllib3/urllib3/compare/2.2.2...2.2.3) \================== ## Features - Added support for Python 3.13. (`#3473 <https://github.com/urllib3/urllib3/issues/3473>`\__) ## Bugfixes - Fixed the default encoding of chunked request bodies to be UTF-8 instead of ISO-8859-1. All other methods of supplying a request body already use UTF-8 starting in urllib3 v2.0. (`#3053 <https://github.com/urllib3/urllib3/issues/3053>`\__) - Fixed ResourceWarning on CONNECT with Python < 3.11.4 by backporting [https://github.com/python/cpython/issues/103472](https://redirect.github.com/python/cpython/issues/103472). (`#3252 <https://github.com/urllib3/urllib3/issues/3252>`\__) - Adjust tolerance for floating-point comparison on Windows to avoid flakiness in CI (`#3413 <https://github.com/urllib3/urllib3/issues/3413>`\__) - Fixed a crash where certain standard library hash functions were absent in restricted environments. (`#3432 <https://github.com/urllib3/urllib3/issues/3432>`\__) - Fixed mypy error when adding to `HTTPConnection.default_socket_options`. (`#3448 <https://github.com/urllib3/urllib3/issues/3448>`\__) ## HTTP/2 (experimental) HTTP/2 support is still in early development. - Excluded Transfer-Encoding: chunked from HTTP/2 request body (`#3425 <https://github.com/urllib3/urllib3/issues/3425>`\__) - Added version checking for `h2` (https://pypi.org/project/h2/) usage. Now only accepting supported h2 major version 4.x.x. (`#3290 <https://github.com/urllib3/urllib3/issues/3290>`\__) - Added a probing mechanism for determining whether a given target origin supports HTTP/2 via ALPN. (`#3301 <https://github.com/urllib3/urllib3/issues/3301>`\__) - Add support for sending a request body with HTTP/2 (`#3302 <https://github.com/urllib3/urllib3/issues/3302>`\__) ## Deprecations and Removals - Note for downstream distributors: the `_version.py` file has been removed and is now created at build time by hatch-vcs. (`#3412 <https://github.com/urllib3/urllib3/issues/3412>`\__) - Drop support for end-of-life PyPy3.8 and PyPy3.9. (`#3475 <https://github.com/urllib3/urllib3/issues/3475>`\__) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 10pm every weekday,before 6am every weekday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/apereo/cas).

This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [urllib3](https://redirect.github.com/urllib3/urllib3) ([changelog](https://redirect.github.com/urllib3/urllib3/blob/main/CHANGES.rst)) | `==2.2.2` -> `==2.2.3` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/urllib3/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/urllib3/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/urllib3/2.2.2/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/urllib3/2.2.2/2.2.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>urllib3/urllib3 (urllib3)</summary> ### [`v2.2.3`](https://redirect.github.com/urllib3/urllib3/blob/HEAD/CHANGES.rst#223-2024-09-12) [Compare Source](https://redirect.github.com/urllib3/urllib3/compare/2.2.2...2.2.3) \================== ## Features - Added support for Python 3.13. (`#3473 <https://github.com/urllib3/urllib3/issues/3473>`\__) ## Bugfixes - Fixed the default encoding of chunked request bodies to be UTF-8 instead of ISO-8859-1. All other methods of supplying a request body already use UTF-8 starting in urllib3 v2.0. (`#3053 <https://github.com/urllib3/urllib3/issues/3053>`\__) - Fixed ResourceWarning on CONNECT with Python < 3.11.4 by backporting [https://github.com/python/cpython/issues/103472](https://redirect.github.com/python/cpython/issues/103472). (`#3252 <https://github.com/urllib3/urllib3/issues/3252>`\__) - Adjust tolerance for floating-point comparison on Windows to avoid flakiness in CI (`#3413 <https://github.com/urllib3/urllib3/issues/3413>`\__) - Fixed a crash where certain standard library hash functions were absent in restricted environments. (`#3432 <https://github.com/urllib3/urllib3/issues/3432>`\__) - Fixed mypy error when adding to `HTTPConnection.default_socket_options`. (`#3448 <https://github.com/urllib3/urllib3/issues/3448>`\__) ## HTTP/2 (experimental) HTTP/2 support is still in early development. - Excluded Transfer-Encoding: chunked from HTTP/2 request body (`#3425 <https://github.com/urllib3/urllib3/issues/3425>`\__) - Added version checking for `h2` (https://pypi.org/project/h2/) usage. Now only accepting supported h2 major version 4.x.x. (`#3290 <https://github.com/urllib3/urllib3/issues/3290>`\__) - Added a probing mechanism for determining whether a given target origin supports HTTP/2 via ALPN. (`#3301 <https://github.com/urllib3/urllib3/issues/3301>`\__) - Add support for sending a request body with HTTP/2 (`#3302 <https://github.com/urllib3/urllib3/issues/3302>`\__) ## Deprecations and Removals - Note for downstream distributors: the `_version.py` file has been removed and is now created at build time by hatch-vcs. (`#3412 <https://github.com/urllib3/urllib3/issues/3412>`\__) - Drop support for end-of-life PyPy3.8 and PyPy3.9. (`#3475 <https://github.com/urllib3/urllib3/issues/3475>`\__) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/sdk-platform-java).

graingert force-pushed the backport-tunnel-from-3-11-4 branch from 15ad8cd to 7d5ee4b Compare January 3, 2024 14:15

graingert changed the title ~~backport HTTPConnection._tunnel from 3.11.4~~ backport HTTPConnection._tunnel from 3.11.4 to unignore remaining ResourceWarnings Jan 3, 2024

graingert added 8 commits January 7, 2024 18:00

backport _tunnel from 3.11.4

9ae7903

cover def _tunnel(): code != http.HTTPStatus.ok

8b0ceff

cover def _tunnel(): if not line:

292a861

cover def _tunnel(): len(line) > _MAXLINE

4bfef42

cover def _tunnel(): self.debuglevel > 0

4db606c

fix mypy

9643b37

sometimes test_early_eof_doesnt_cause_infinite_loop raises ProtocolError

d326df3

add newsfragment

42e444f

graingert force-pushed the backport-tunnel-from-3-11-4 branch from 6b462dc to 42e444f Compare January 7, 2024 18:05

graingert marked this pull request as ready for review January 7, 2024 18:05

use consume_socket for test_proxy_status_not_ok

5deccde

Merge branch 'main' into backport-tunnel-from-3-11-4

3d36845

coletdjnz mentioned this pull request May 3, 2024

Unclosed socket warning after HTTP 407 response from HTTP CONNECT proxy #3374

Closed

pquentin added 2 commits August 13, 2024 21:54

Merge remote-tracking branch 'origin/main' into backport-tunnel-from-…

bf66264

…3-11-4

Remove unused type: ignore comment

1b72d82

pquentin changed the title ~~backport HTTPConnection._tunnel from 3.11.4 to unignore remaining ResourceWarnings~~ Fix ResourceWarning on CONNECT with Python < 3.11.4 Aug 13, 2024

Follow changelog entry guidelines

6a5114c

pquentin approved these changes Aug 13, 2024

View reviewed changes

sethmlarson approved these changes Aug 13, 2024

View reviewed changes

Merge branch 'main' into backport-tunnel-from-3-11-4

571428a

pquentin merged commit be24439 into urllib3:main Aug 14, 2024
36 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix ResourceWarning on CONNECT with Python < 3.11.4 #3252

Fix ResourceWarning on CONNECT with Python < 3.11.4 #3252

Uh oh!

graingert commented Dec 31, 2023 •

edited by pquentin

Loading

Uh oh!

sethmlarson commented Jan 9, 2024

Uh oh!

graingert commented Jan 9, 2024

Uh oh!

pquentin left a comment

Uh oh!

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Uh oh!

Fix ResourceWarning on CONNECT with Python < 3.11.4 #3252

Fix ResourceWarning on CONNECT with Python < 3.11.4 #3252

Uh oh!

Conversation

graingert commented Dec 31, 2023 • edited by pquentin Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sethmlarson commented Jan 9, 2024

Uh oh!

graingert commented Jan 9, 2024

Uh oh!

pquentin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

graingert commented Dec 31, 2023 •

edited by pquentin

Loading