Fix Response.text when body is Payload #6485

Dreamsorcerer · 2022-01-03T16:51:23Z

for more information, see https://pre-commit.ci

codecov · 2022-01-03T17:06:13Z

Codecov Report

All modified and coverable lines are covered by tests ✅

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

✅ 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%)`	⬆️
OS-Linux	`97.82% <100.00%> (+0.01%)`	⬆️
OS-Windows	`96.22% <100.00%> (+0.01%)`	⬆️
OS-macOS	`97.49% <100.00%> (+0.01%)`	⬆️
Py-3.10.11	`97.59% <100.00%> (+0.01%)`	⬆️
Py-3.10.14	`97.52% <100.00%> (+0.01%)`	⬆️
Py-3.11.9	`97.75% <100.00%> (+0.01%)`	⬆️
Py-3.12.4	`?`
Py-3.12.5	`97.87% <100.00%> (+0.32%)`	⬆️
Py-3.9.13	`97.48% <100.00%> (+0.01%)`	⬆️
Py-3.9.19	`97.42% <100.00%> (+0.01%)`	⬆️
Py-pypy7.3.16	`97.03% <100.00%> (+0.01%)`	⬆️
VM-macos	`97.49% <100.00%> (+0.01%)`	⬆️
VM-ubuntu	`97.82% <100.00%> (+0.01%)`	⬆️
VM-windows	`96.22% <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.

aiohttp/payload.py

for more information, see https://pre-commit.ci

tests/test_payload.py

Dreamsorcerer · 2024-08-28T12:41:35Z

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

for more information, see https://pre-commit.ci

tests/test_web_response.py

patchback · 2024-08-29T20:58:54Z

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

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

Backporting merged PR #6485 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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

Now, cherry-pick PR Fix Response.text when body is Payload #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
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix Response.text when body is Payload #6485 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.10/9418a4a1486beed0ae8a5c47277ecd67758eb5e2/pr-6485

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 · 2024-08-29T20:59:00Z

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

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

Backporting merged PR #6485 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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

Now, cherry-pick PR Fix Response.text when body is Payload #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
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix Response.text when body is Payload #6485 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.11/9418a4a1486beed0ae8a5c47277ecd67758eb5e2/pr-6485

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.

(cherry picked from commit 9418a4a)

In aiohttp 3.10.6 aio-libs/aiohttp#6485 a new abstract method was implemented in aiohttp.Payload. So trying to instantiate the AsyncNamedFilePart class fails and causes the push command to fail: ``` File "/usr/sbin/flat-manager-client", line 350, in upload_objects named = get_object_multipart(repo_path, file_obj) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/sbin/flat-manager-client", line 738, in get_object_multipart return AsyncNamedFilePart( ^^^^^^^^^^^^^^^^^^^ TypeError: Can't instantiate abstract class AsyncNamedFilePart without an implementation for abstract method 'decode' ``` Create a placeholder method for now.

Fix Response.text when body is Payload.

f166143

Dreamsorcerer requested a review from asvetlov as a code owner January 3, 2022 16:51

pre-commit-ci bot and others added 2 commits January 3, 2022 16:52

[pre-commit.ci] auto fixes from pre-commit.com hooks

55427e8

for more information, see https://pre-commit.ci

Update payload.py

6ddb876

Merge branch 'master' into payloads

c1b7051

Dreamsorcerer assigned asvetlov May 17, 2023

Merge branch 'master' into payloads

8df3328

Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 27, 2024

Dreamsorcerer commented Aug 28, 2024

View reviewed changes

aiohttp/payload.py Outdated Show resolved Hide resolved

Dreamsorcerer and others added 5 commits August 28, 2024 02:01

Cleanup

681a726

[pre-commit.ci] auto fixes from pre-commit.com hooks

7c470cc

for more information, see https://pre-commit.ci

And multipart

d1a4929

[pre-commit.ci] auto fixes from pre-commit.com hooks

9324da6

for more information, see https://pre-commit.ci

And test

1c27e71

Dreamsorcerer commented Aug 28, 2024

View reviewed changes

tests/test_payload.py Outdated Show resolved Hide resolved

Dreamsorcerer added 4 commits August 28, 2024 02:09

Update tests/test_payload.py

81424ab

Tweak

4ae0635

xMerge branch 'payloads' of github.com:aio-libs/aiohttp into payloads

6070ae1

Create 6485.bugfix.rst

c38d10a

Dreamsorcerer requested a review from webknjaz as a code owner August 28, 2024 01:13

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 28, 2024

Dreamsorcerer added 3 commits August 28, 2024 02:42

Update test_web_response.py

d55ac6a

Coverage

987c2bf

Merge branch 'payloads' of github.com:aio-libs/aiohttp into payloads

f6e7c60

Dreamsorcerer and others added 2 commits August 29, 2024 20:33

Bonus coverage

23a9dcf

[pre-commit.ci] auto fixes from pre-commit.com hooks

384ae33

for more information, see https://pre-commit.ci

Dreamsorcerer commented Aug 29, 2024

View reviewed changes

tests/test_web_response.py Outdated Show resolved Hide resolved

Update tests/test_web_response.py

29d5e13

Dreamsorcerer merged commit 9418a4a into master Aug 29, 2024
35 of 36 checks passed

Dreamsorcerer deleted the payloads branch August 29, 2024 20:58

Dreamsorcerer added a commit that referenced this pull request Aug 29, 2024

Fix Response.text when body is Payload (#6485)

0af85cb

(cherry picked from commit 9418a4a)

Dreamsorcerer added a commit that referenced this pull request Aug 29, 2024

Fix Response.text when body is Payload (#6485)

3ac09e0

(cherry picked from commit 9418a4a)

Dreamsorcerer added a commit that referenced this pull request Aug 29, 2024

Fix Response.text when body is Payload (#6485) (#8937)

1dc3cd6

(cherry picked from commit 9418a4a)

Dreamsorcerer added a commit that referenced this pull request Aug 29, 2024

Fix Response.text when body is Payload (#6485) (#8938)

948ca8c

(cherry picked from commit 9418a4a)

booniepepper mentioned this pull request Sep 3, 2024

patchback/backports/3.11/1d170d37f476df705a9dcc3588e192e8ccb871c0/pr 7731 #9005

Closed

5 tasks

bdraco mentioned this pull request Sep 18, 2024

Speedup aiohttp web server #2779

Closed

bbhtt mentioned this pull request Oct 29, 2024

client: Fix push command with aiohttp >= 3.10.6 flatpak/flat-manager#139

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Response.text when body is Payload #6485

Fix Response.text when body is Payload #6485

Dreamsorcerer commented Jan 3, 2022 •

edited

Loading

codecov bot commented Jan 3, 2022 •

edited

Loading

Dreamsorcerer commented Aug 28, 2024

patchback bot commented Aug 29, 2024 •

edited

Loading

patchback bot commented Aug 29, 2024 •

edited

Loading

Fix Response.text when body is Payload #6485

Fix Response.text when body is Payload #6485

Conversation

Dreamsorcerer commented Jan 3, 2022 • edited Loading

codecov bot commented Jan 3, 2022 • edited Loading

Codecov Report

Dreamsorcerer commented Aug 28, 2024

patchback bot commented Aug 29, 2024 • edited Loading

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

Backporting merged PR #6485 into master

patchback bot commented Aug 29, 2024 • edited Loading

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

Backporting merged PR #6485 into master

Dreamsorcerer commented Jan 3, 2022 •

edited

Loading

codecov bot commented Jan 3, 2022 •

edited

Loading

patchback bot commented Aug 29, 2024 •

edited

Loading

patchback bot commented Aug 29, 2024 •

edited

Loading