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

Fix inappropriate "break in finally" #10434

Merged
merged 12 commits into from
Feb 17, 2025

Conversation

Cycloctane
Copy link
Member

@Cycloctane Cycloctane commented Feb 7, 2025

What do these changes do?

Remove break statement inside the finally block in file aiohttp/webprotocol.py.

Are there changes in behavior for the user?

Is it a substantial burden for the maintainers to support this?

Related issue number

Fixes #9521

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
  • Add a new news fragment into the CHANGES/ folder

@Cycloctane Cycloctane requested a review from asvetlov as a code owner February 7, 2025 08:21
Copy link

codspeed-hq bot commented Feb 7, 2025

CodSpeed Performance Report

Merging #10434 will not alter performance

Comparing Cycloctane:avoid_break_in_finally (a7b2d92) with master (97f5e2d)

Summary

✅ 48 untouched benchmarks

Copy link

codecov bot commented Feb 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.69%. Comparing base (97f5e2d) to head (a7b2d92).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10434      +/-   ##
==========================================
- Coverage   98.70%   98.69%   -0.01%     
==========================================
  Files         122      122              
  Lines       37180    37191      +11     
  Branches     2058     2056       -2     
==========================================
+ Hits        36698    36706       +8     
- Misses        335      338       +3     
  Partials      147      147              
Flag Coverage Δ
CI-GHA 98.58% <100.00%> (-0.01%) ⬇️
OS-Linux 98.24% <100.00%> (-0.01%) ⬇️
OS-Windows 96.18% <100.00%> (-0.01%) ⬇️
OS-macOS 97.36% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.27% <100.00%> (+<0.01%) ⬆️
Py-3.10.16 97.82% <100.00%> (+<0.01%) ⬆️
Py-3.11.11 97.89% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.36% <100.00%> (-0.01%) ⬇️
Py-3.12.8 98.36% <100.00%> (+<0.01%) ⬆️
Py-3.12.9 ?
Py-3.13.1 98.35% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.16% <90.00%> (-0.01%) ⬇️
Py-3.9.21 97.69% <90.00%> (-0.02%) ⬇️
Py-pypy7.3.16 97.29% <90.00%> (-0.01%) ⬇️
VM-macos 97.36% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.24% <100.00%> (-0.01%) ⬇️
VM-windows 96.18% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Cycloctane Cycloctane requested a review from webknjaz as a code owner February 7, 2025 09:18
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Feb 7, 2025
aiohttp/web_protocol.py Outdated Show resolved Hide resolved
aiohttp/web_protocol.py Outdated Show resolved Hide resolved
@bdraco bdraco added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels Feb 10, 2025
aiohttp/web_protocol.py Outdated Show resolved Hide resolved
Co-authored-by: J. Nick Koston <[email protected]>
@bdraco
Copy link
Member

bdraco commented Feb 10, 2025

Thanks @Cycloctane

Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, thank you!

@bdraco bdraco merged commit ed84464 into aio-libs:master Feb 17, 2025
40 checks passed
Copy link
Contributor

patchback bot commented Feb 17, 2025

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ed84464 on top of patchback/backports/3.11/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434

Backporting merged PR #10434 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434 upstream/3.11
  4. Now, cherry-pick PR Fix inappropriate "break in finally" #10434 contents into that branch:
    $ git cherry-pick -x ed84464a62ddd0b271c9ecb2e05d1ce307439ad0
    If it'll yell at you with something like fatal: Commit ed84464a62ddd0b271c9ecb2e05d1ce307439ad0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ed84464a62ddd0b271c9ecb2e05d1ce307439ad0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix inappropriate "break in finally" #10434 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Feb 17, 2025

Backport to 3.12: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ed84464 on top of patchback/backports/3.12/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434

Backporting merged PR #10434 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.12/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434 upstream/3.12
  4. Now, cherry-pick PR Fix inappropriate "break in finally" #10434 contents into that branch:
    $ git cherry-pick -x ed84464a62ddd0b271c9ecb2e05d1ce307439ad0
    If it'll yell at you with something like fatal: Commit ed84464a62ddd0b271c9ecb2e05d1ce307439ad0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ed84464a62ddd0b271c9ecb2e05d1ce307439ad0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix inappropriate "break in finally" #10434 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/ed84464a62ddd0b271c9ecb2e05d1ce307439ad0/pr-10434
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

break in finally can swallow exception
4 participants