aiohttp icon indicating copy to clipboard operation
aiohttp copied to clipboard

Fix Response.text when body is Payload

Open Dreamsorcerer opened this issue 3 years ago • 1 comments
trafficstars

Fixes #6476.

Dreamsorcerer avatar Jan 03 '22 16:01 Dreamsorcerer

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 98.26%. Comparing base (1d21dce) to head (29d5e13). Report is 1083 commits behind head on master.

:white_check_mark: All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6485      +/-   ##
==========================================
+ Coverage   98.25%   98.26%   +0.01%     
==========================================
  Files         107      107              
  Lines       34125    34178      +53     
  Branches     4048     4054       +6     
==========================================
+ Hits        33530    33586      +56     
+ Misses        421      418       -3     
  Partials      174      174              
Flag Coverage Δ
CI-GHA 98.16% <100.00%> (+0.01%) :arrow_up:
OS-Linux 97.82% <100.00%> (+0.01%) :arrow_up:
OS-Windows 96.22% <100.00%> (+0.01%) :arrow_up:
OS-macOS 97.49% <100.00%> (+0.01%) :arrow_up:
Py-3.10.11 97.59% <100.00%> (+0.01%) :arrow_up:
Py-3.10.14 97.52% <100.00%> (+0.01%) :arrow_up:
Py-3.11.9 97.75% <100.00%> (+0.01%) :arrow_up:
Py-3.12.4 ?
Py-3.12.5 97.87% <100.00%> (+0.32%) :arrow_up:
Py-3.9.13 97.48% <100.00%> (+0.01%) :arrow_up:
Py-3.9.19 97.42% <100.00%> (+0.01%) :arrow_up:
Py-pypy7.3.16 97.03% <100.00%> (+0.01%) :arrow_up:
VM-macos 97.49% <100.00%> (+0.01%) :arrow_up:
VM-ubuntu 97.82% <100.00%> (+0.01%) :arrow_up:
VM-windows 96.22% <100.00%> (+0.01%) :arrow_up:

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

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

codecov[bot] avatar Jan 03 '22 17:01 codecov[bot]

I swear a lot of these Payloads are overlapping and half of them could be removed...

Dreamsorcerer avatar Aug 28 '24 12:08 Dreamsorcerer

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

❌ Failed to cleanly apply 9418a4a1486beed0ae8a5c47277ecd67758eb5e2 on top of patchback/backports/3.10/9418a4a1486beed0ae8a5c47277ecd67758eb5e2/pr-6485

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

patchback[bot] avatar Aug 29 '24 20:08 patchback[bot]

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

❌ Failed to cleanly apply 9418a4a1486beed0ae8a5c47277ecd67758eb5e2 on top of patchback/backports/3.11/9418a4a1486beed0ae8a5c47277ecd67758eb5e2/pr-6485

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

patchback[bot] avatar Aug 29 '24 20:08 patchback[bot]