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 lost details on HttpProcessingError #9052

Merged
merged 7 commits into from
Sep 20, 2024
Merged

Fix lost details on HttpProcessingError #9052

merged 7 commits into from
Sep 20, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #8395.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 7, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 7, 2024
Copy link

codecov bot commented Sep 7, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 98.31%. Comparing base (e8d8e28) to head (45c36b7).
Report is 1125 commits behind head on master.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
aiohttp/client_proto.py 50.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9052      +/-   ##
==========================================
+ Coverage   98.30%   98.31%   +0.01%     
==========================================
  Files         107      107              
  Lines       34355    34510     +155     
  Branches     4066     4100      +34     
==========================================
+ Hits        33771    33929     +158     
+ Misses        412      410       -2     
+ Partials      172      171       -1     
Flag Coverage Δ
CI-GHA 98.21% <50.00%> (+0.01%) ⬆️
OS-Linux 97.87% <50.00%> (+0.01%) ⬆️
OS-Windows 96.29% <50.00%> (+0.02%) ⬆️
OS-macOS 97.55% <50.00%> (+0.01%) ⬆️
Py-3.10.11 97.65% <50.00%> (+0.02%) ⬆️
Py-3.10.14 ?
Py-3.10.15 97.58% <50.00%> (?)
Py-3.11.10 97.47% <50.00%> (?)
Py-3.11.9 97.54% <50.00%> (-0.26%) ⬇️
Py-3.12.5 ?
Py-3.12.6 97.93% <50.00%> (?)
Py-3.9.13 97.53% <50.00%> (+0.01%) ⬆️
Py-3.9.19 ?
Py-3.9.20 97.48% <50.00%> (?)
Py-pypy7.3.16 97.09% <50.00%> (+0.02%) ⬆️
VM-macos 97.55% <50.00%> (+0.01%) ⬆️
VM-ubuntu 97.87% <50.00%> (+0.01%) ⬆️
VM-windows 96.29% <50.00%> (+0.02%) ⬆️

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.

@Dreamsorcerer
Copy link
Member Author

Our codecov doesn't actually include any other types of exceptions...

@Dreamsorcerer
Copy link
Member Author

There doesn't appear to be any reason we should be catching other exceptions...

CHANGES/9052.bugfix.rst Outdated Show resolved Hide resolved
@Dreamsorcerer Dreamsorcerer merged commit 8911419 into master Sep 20, 2024
33 of 35 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-exc branch September 20, 2024 12:40
Copy link
Contributor

patchback bot commented Sep 20, 2024

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

❌ Failed to cleanly apply 8911419 on top of patchback/backports/3.10/89114196040e6b4e435799939dfde6141223cc12/pr-9052

Backporting merged PR #9052 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.10/89114196040e6b4e435799939dfde6141223cc12/pr-9052 upstream/3.10
  4. Now, cherry-pick PR Fix lost details on HttpProcessingError #9052 contents into that branch:
    $ git cherry-pick -x 89114196040e6b4e435799939dfde6141223cc12
    If it'll yell at you with something like fatal: Commit 89114196040e6b4e435799939dfde6141223cc12 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 89114196040e6b4e435799939dfde6141223cc12
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix lost details on HttpProcessingError #9052 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/89114196040e6b4e435799939dfde6141223cc12/pr-9052
  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 Sep 20, 2024

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

❌ Failed to cleanly apply 8911419 on top of patchback/backports/3.11/89114196040e6b4e435799939dfde6141223cc12/pr-9052

Backporting merged PR #9052 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/89114196040e6b4e435799939dfde6141223cc12/pr-9052 upstream/3.11
  4. Now, cherry-pick PR Fix lost details on HttpProcessingError #9052 contents into that branch:
    $ git cherry-pick -x 89114196040e6b4e435799939dfde6141223cc12
    If it'll yell at you with something like fatal: Commit 89114196040e6b4e435799939dfde6141223cc12 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 89114196040e6b4e435799939dfde6141223cc12
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix lost details on HttpProcessingError #9052 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/89114196040e6b4e435799939dfde6141223cc12/pr-9052
  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.

Dreamsorcerer added a commit that referenced this pull request Sep 20, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 20, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 20, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 20, 2024
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 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.

Error message not always propagated on 3.9.4
3 participants