patchback/backports/3.11/d067260df75e4d04a23a0481cf9cf8f7194c80f1/pr-10551 - Branch - aio-libs/aiohttp

[PR #10551/d067260d backport][3.11] Re-raise OSError as ClientConnectionError when failing to explicitly close connector socket

#10561Merged

Comparing

patchback/backports/3.11/d067260df75e4d04a23a0481cf9cf8f7194c80f1/pr-10551

(

ae7c211

) with

3.11

(

e9f3f03

)

Improvements: 0

Regressions: 0

Untouched: 47

New: 0

Dropped: 0

Ignored: 2

Benchmarks

Passed

test_one_thousand_large_round_trip_websocket_text_messages[pyloop]

tests/test_benchmarks_client_ws.py::test_one_thousand_large_round_trip_websocket_text_messages[pyloop]

+4%

24.3 ms

23.3 ms

test_resolve_static_root_route[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_static_root_route[pyloop]

+1%

983.2 µs

978.2 µs

test_resolve_dynamic_resource_url_with_many_dynamic_routes_with_common_prefix[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_dynamic_resource_url_with_many_dynamic_routes_with_common_prefix[pyloop]

247.2 ms

246 ms

test_simple_web_stream_response

tests/test_benchmarks_web_response.py::test_simple_web_stream_response

241.2 µs

240.1 µs

test_resolve_gitapi[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_gitapi[pyloop]

293.7 ms

292.4 ms

test_resolve_multiple_level_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_multiple_level_fixed_url_with_many_routes[pyloop]

8.6 ms

8.5 ms

test_resolve_multiple_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_multiple_fixed_url_with_many_routes[pyloop]

2.2 ms

test_resolve_dynamic_resource_url_with_many_static_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_dynamic_resource_url_with_many_static_routes[pyloop]

3.6 ms

test_one_hundred_json_post_requests[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_json_post_requests[pyloop]

38.9 ms

38.8 ms

test_send_client_request_one_hundred[pyloop]

tests/test_benchmarks_client_request.py::test_send_client_request_one_hundred[pyloop]

2.5 ms

2.4 ms

test_one_hundred_get_requests_with_30000_chunked_payload[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_30000_chunked_payload[pyloop]

40.8 ms

40.7 ms

test_resolve_dynamic_resource_url_with_many_dynamic_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_dynamic_resource_url_with_many_dynamic_routes[pyloop]

3.6 ms

3.5 ms

test_resolve_gitapi_root[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_gitapi_root[pyloop]

2 ms

test_one_hundred_get_requests_with_1024_content_length_payload[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_1024_content_length_payload[pyloop]

35.4 ms

35.3 ms

test_one_hundred_get_requests_with_30000_content_length_payload[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_30000_content_length_payload[pyloop]

39.7 ms

39.6 ms

test_client_request_update_cookies[pyloop]

tests/test_benchmarks_client_request.py::test_client_request_update_cookies[pyloop]

169.1 µs

168.8 µs

test_resolve_gitapi_subapps[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_gitapi_subapps[pyloop]

295.5 ms

294.9 ms

test_one_hundred_simple_post_requests[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_simple_post_requests[pyloop]

37 ms

36.9 ms

test_one_hundred_get_requests_with_1024_chunked_payload[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_1024_chunked_payload[pyloop]

35.8 ms

35.7 ms

test_one_hundred_simple_get_requests_multiple_methods_route[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_simple_get_requests_multiple_methods_route[pyloop]

32.2 ms

test_resolve_prefix_resources_many_prefix_many_plain[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_prefix_resources_many_prefix_many_plain[pyloop]

4.9 ms

test_one_hundred_simple_get_requests[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_simple_get_requests[pyloop]

32.5 ms

32.4 ms

test_web_response_with_headers

tests/test_benchmarks_web_response.py::test_web_response_with_headers

880.7 µs

879.7 µs

test_one_hundred_get_requests_with_512kib_content_length_payload[pyloop]

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_512kib_content_length_payload[pyloop]

165.1 ms

164.9 ms

test_send_one_hundred_websocket_compressed_messages[pyloop]

tests/test_benchmarks_http_websocket.py::test_send_one_hundred_websocket_compressed_messages[pyloop]

3 ms

test_one_thousand_round_trip_websocket_text_messages[pyloop]

tests/test_benchmarks_client_ws.py::test_one_thousand_round_trip_websocket_text_messages[pyloop]

17.5 ms

test_ten_web_middlewares[pyloop]

tests/test_benchmarks_web_middleware.py::test_ten_web_middlewares[pyloop]

35.2 ms

test_read_one_hundred_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py::test_read_one_hundred_websocket_text_messages[pyloop]

300.2 µs

300.1 µs

test_resolve_root_route[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_root_route[pyloop]

887.8 µs

887.5 µs

test_read_large_binary_websocket_messages[pyloop]

tests/test_benchmarks_http_websocket.py::test_read_large_binary_websocket_messages[pyloop]

9.1 ms

test_simple_web_file_response[pyloop]

tests/test_benchmarks_web_fileresponse.py::test_simple_web_file_response[pyloop]

79 ms

test_get_request_with_251308_compressed_chunked_payload[pyloop]

tests/test_benchmarks_client.py::test_get_request_with_251308_compressed_chunked_payload[pyloop]

425.9 ms

426 ms

test_send_one_hundred_large_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py::test_send_one_hundred_large_websocket_text_messages[pyloop]

533.3 µs

533.5 µs

test_serialize_headers

tests/test_benchmarks_http_writer.py::test_serialize_headers

1 ms

test_one_thousand_round_trip_websocket_binary_messages[pyloop]

tests/test_benchmarks_client_ws.py::test_one_thousand_round_trip_websocket_binary_messages[pyloop]

17.1 ms

test_send_one_hundred_websocket_text_messages_with_mask[pyloop]

tests/test_benchmarks_http_websocket.py::test_send_one_hundred_websocket_text_messages_with_mask[pyloop]

792.2 µs

793.3 µs

test_resolve_single_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_single_fixed_url_with_many_routes[pyloop]

892 µs

893.8 µs

test_resolve_root_route_with_many_fixed_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py::test_resolve_root_route_with_many_fixed_routes[pyloop]

885.4 µs

888 µs

test_simple_web_response

tests/test_benchmarks_web_response.py::test_simple_web_response

446.6 µs

448 µs

test_simple_web_file_response_not_modified[pyloop]

tests/test_benchmarks_web_fileresponse.py::test_simple_web_file_response_not_modified[pyloop]

55.7 ms

55.9 ms

test_simple_web_file_sendfile_fallback_response[pyloop]

tests/test_benchmarks_web_fileresponse.py::test_simple_web_file_sendfile_fallback_response[pyloop]

84.9 ms

85.2 ms

test_web_response_with_bytes_body

tests/test_benchmarks_web_response.py::test_web_response_with_bytes_body

-1%

536.5 µs

539.8 µs

test_send_one_hundred_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py::test_send_one_hundred_websocket_text_messages[pyloop]

-1%

556.5 µs

560.4 µs

test_web_response_with_text_body

tests/test_benchmarks_web_response.py::test_web_response_with_text_body

-1%

653.7 µs

658.8 µs

test_load_cookies_into_temp_cookiejar

tests/test_benchmarks_cookiejar.py::test_load_cookies_into_temp_cookiejar

-1%

200.4 µs

202.4 µs

test_create_client_request_with_cookies[pyloop]

tests/test_benchmarks_client_request.py::test_create_client_request_with_cookies[pyloop]

-1%

125.9 µs

127.5 µs

test_create_client_request_with_headers[pyloop]

tests/test_benchmarks_client_request.py::test_create_client_request_with_headers[pyloop]

-2%

69.4 µs

70.6 µs

Ignored

test_one_hundred_get_requests_iter_chunks_on_512kib_chunked_payload[pyloop]Ignored

tests/test_benchmarks_client.py::test_one_hundred_get_requests_iter_chunks_on_512kib_chunked_payload[pyloop]

108.6 ms

108.4 ms

test_one_hundred_get_requests_with_512kib_chunked_payload[pyloop]Ignored

tests/test_benchmarks_client.py::test_one_hundred_get_requests_with_512kib_chunked_payload[pyloop]

166.6 ms

166.5 ms

Commits

Click on a commit to change the comparison range

Base

3.11

e9f3f03

Re-raise OSError as ClientConnectionError when failing to explicitly close connector socket (#10551)  ## What do these changes do? This is a followup to #10464 to handle the case where `socket.close()` can also raise. This matches the logic we have in aiohappyeyeballs: https://github.com/aio-libs/aiohappyeyeballs/blob/e3bd5bdf44f5d187802de6dcb08d27e1ca6da048/src/aiohappyeyeballs/impl.py#L227 We shouldn't raising `OSError` externally from this method as callers expect a `ClientError` ## Are there changes in behavior for the user? bugfix ## Is it a substantial burden for the maintainers to support this? no ## Related issue number fixes #10506 ## Checklist - [x] I think the code is well written - [x] Unit tests for the changes exist - [x] Documentation reflects the changes - [x] If you provide code modification, please add yourself to `CONTRIBUTORS.txt` * The format is <Name> <Surname>. * Please keep alphabetical order, the file is sorted by names. - [x] Add a new news fragment into the `CHANGES/` folder * name it `<issue_or_pr_num>.<type>.rst` (e.g. `588.bugfix.rst`) * if you don't have an issue number, change it to the pull request number after creating the PR * `.bugfix`: A bug fix for something the maintainers deemed an improper undesired behavior that got corrected to match pre-agreed expectations. * `.feature`: A new behavior, public APIs. That sort of stuff. * `.deprecation`: A declaration of future API removals and breaking changes in behavior. * `.breaking`: When something public is removed in a breaking way. Could be deprecated in an earlier release. * `.doc`: Notable updates to the documentation structure or build process. * `.packaging`: Notes for downstreams about unobvious side effects and tooling. Changes in the test invocation considerations and runtime assumptions. * `.contrib`: Stuff that affects the contributor experience. e.g. Running tests, building the docs, setting up the development environment. * `.misc`: Changes that are hard to assign to any of the above categories. * Make sure to use full sentences with correct case and punctuation, for example: ```rst Fixed issue with non-ascii contents in doctest text files -- by :user:`contributor-gh-handle`. ``` Use the past tense or the present tense a non-imperative mood, referring to what's changed compared to the last released version of this project. (cherry picked from commit d067260df75e4d04a23a0481cf9cf8f7194c80f1)

ae7c211

12 days ago

by bdraco

Home Terms Privacy Docs