Use `quote_cookie` setting from ClientSession's cookiejar in `tmp_cookie_jar` #10093

Cycloctane · 2024-12-02T14:01:18Z

What do these changes do?

Reuse quote_cookie setting from ClientSession's cookiejar when creating temporary CookieJar in request method.

Are there changes in behavior for the user?

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

This pr add a new property method to the abstract class of client's CookieJar.

Related issue number

Fixes #9336

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

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.

…eJar

aiohttp/client.py

codspeed-hq · 2024-12-02T14:09:15Z

CodSpeed Performance Report

Merging #10093 will not alter performance

_{Comparing Cycloctane:fix_quote_cookie (1d1b5d4) with master (dbd77ad)}

Summary

✅ 47 untouched benchmarks

codecov · 2024-12-02T14:09:18Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.75%. Comparing base (dbd77ad) to head (1d1b5d4).
Report is 7 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master   #10093   +/-   ##
=======================================
  Coverage   98.74%   98.75%           
=======================================
  Files         122      122           
  Lines       36956    36965    +9     
  Branches     4411     4415    +4     
=======================================
+ Hits        36494    36503    +9     
  Misses        315      315           
  Partials      147      147

Flag	Coverage Δ
CI-GHA	`98.63% <100.00%> (+<0.01%)`	⬆️
OS-Linux	`98.32% <100.00%> (+<0.01%)`	⬆️
OS-Windows	`96.17% <100.00%> (+<0.01%)`	⬆️
OS-macOS	`97.43% <100.00%> (+<0.01%)`	⬆️
Py-3.10.11	`97.27% <100.00%> (+<0.01%)`	⬆️
Py-3.10.15	`97.81% <100.00%> (+<0.01%)`	⬆️
Py-3.11.10	`97.85% <100.00%> (+<0.01%)`	⬆️
Py-3.11.9	`97.32% <100.00%> (-0.02%)`	⬇️
Py-3.12.7	`98.37% <100.00%> (+<0.01%)`	⬆️
Py-3.13.0	`97.18% <100.00%> (-0.01%)`	⬇️
Py-3.13.1	`98.34% <100.00%> (+<0.01%)`	⬆️
Py-3.9.13	`97.19% <100.00%> (+<0.01%)`	⬆️
Py-3.9.20	`97.73% <100.00%> (-0.05%)`	⬇️
Py-pypy7.3.16	`97.34% <100.00%> (+<0.01%)`	⬆️
VM-macos	`97.43% <100.00%> (+<0.01%)`	⬆️
VM-ubuntu	`98.32% <100.00%> (+<0.01%)`	⬆️
VM-windows	`96.17% <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.

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

aiohttp/cookiejar.py

bdraco · 2024-12-05T18:48:40Z

Doing a release shortly. Drafting while #10093 (comment) is being worked out.

Dreamsorcerer · 2024-12-06T23:51:27Z

Seems to be coverage of web_response.py:268 being lost by this change. Do we need to remove that check, or adjust a test..?

Dreamsorcerer · 2024-12-07T00:18:00Z

Nevermind, probably a confusion with being out of sync with master, it's gone now. This is probably ready then.

bdraco · 2024-12-17T18:18:41Z

patchback · 2024-12-17T18:26:56Z

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

❌ Failed to cleanly apply 7b5d54a on top of patchback/backports/3.11/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093

Backporting merged PR #10093 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/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093 upstream/3.11

Now, cherry-pick PR Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093 contents into that branch:
```
$ git cherry-pick -x 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f
```
If it'll yell at you with something like fatal: Commit 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.11/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093

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-12-17T18:27:02Z

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

❌ Failed to cleanly apply 7b5d54a on top of patchback/backports/3.12/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093

Backporting merged PR #10093 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.12/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093 upstream/3.12

Now, cherry-pick PR Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093 contents into that branch:
```
$ git cherry-pick -x 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f
```
If it'll yell at you with something like fatal: Commit 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.12/7b5d54a96c1dd1282e9a79f9fc8056c02ca91c6f/pr-10093

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.

…kie_jar` (#10093) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <git@sambull.org> (cherry picked from commit 7b5d54a)

bdraco · 2024-12-17T18:32:00Z

backport 3.11 #10175

…kie_jar` (#10093) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <git@sambull.org> (cherry picked from commit 7b5d54a)

bdraco · 2024-12-17T18:32:47Z

backport 3.12 #10176

…ientSession's cookiejar in `tmp_cookie_jar` (#10175) Co-authored-by: pre-commit-ci[bot] Co-authored-by: Sam Bull <git@sambull.org> Co-authored-by: Cycloctane <Octane-vs@outlook.com>

…ientSession's cookiejar in `tmp_cookie_jar` (#10176) Co-authored-by: pre-commit-ci[bot] Co-authored-by: Sam Bull <git@sambull.org> Co-authored-by: Cycloctane <Octane-vs@outlook.com>

Cycloctane added 3 commits December 2, 2024 20:56

add quote_cookie getter to cookiejar

e283a64

reuse clientsession's CookieJar setting when creating temporary Cooki…

af54f48

…eJar

fix test

5613ea0

Cycloctane requested a review from asvetlov as a code owner December 2, 2024 14:01

Cycloctane requested a review from Dreamsorcerer December 2, 2024 14:03

Dreamsorcerer reviewed Dec 2, 2024

View reviewed changes

aiohttp/client.py Show resolved Hide resolved

Dreamsorcerer approved these changes Dec 2, 2024

View reviewed changes

Dreamsorcerer 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 Dec 2, 2024

update changelog

1bbfecd

Cycloctane requested a review from webknjaz as a code owner December 2, 2024 15:17

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

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

61a042e

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

bdraco reviewed Dec 4, 2024

View reviewed changes

aiohttp/cookiejar.py Show resolved Hide resolved

Cycloctane added 4 commits December 5, 2024 10:20

add test

bbc9fe4

fix change log

8532f39

update changelog

d3bd9d1

update changelog

db440ac

bdraco approved these changes Dec 5, 2024

View reviewed changes

bdraco marked this pull request as draft December 5, 2024 18:48

Merge branch 'master' into fix_quote_cookie

1d1b5d4

Dreamsorcerer marked this pull request as ready for review December 7, 2024 00:18

bdraco approved these changes Dec 17, 2024

View reviewed changes

bdraco merged commit 7b5d54a into aio-libs:master Dec 17, 2024
40 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `quote_cookie` setting from ClientSession's cookiejar in `tmp_cookie_jar` #10093

Use `quote_cookie` setting from ClientSession's cookiejar in `tmp_cookie_jar` #10093

Cycloctane commented Dec 2, 2024

codspeed-hq bot commented Dec 2, 2024 •

edited

Loading

codecov bot commented Dec 2, 2024 •

edited

Loading

bdraco commented Dec 5, 2024

Dreamsorcerer commented Dec 6, 2024

Dreamsorcerer commented Dec 7, 2024

bdraco commented Dec 17, 2024

patchback bot commented Dec 17, 2024 •

edited

Loading

patchback bot commented Dec 17, 2024 •

edited

Loading

bdraco commented Dec 17, 2024

bdraco commented Dec 17, 2024

Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093

Use quote_cookie setting from ClientSession's cookiejar in tmp_cookie_jar #10093

Conversation

Cycloctane commented Dec 2, 2024

What do these changes do?

Are there changes in behavior for the user?

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

Related issue number

Checklist

codspeed-hq bot commented Dec 2, 2024 • edited Loading

CodSpeed Performance Report

Merging #10093 will not alter performance

Summary

codecov bot commented Dec 2, 2024 • edited Loading

Codecov Report

bdraco commented Dec 5, 2024

Dreamsorcerer commented Dec 6, 2024

Dreamsorcerer commented Dec 7, 2024

bdraco commented Dec 17, 2024

patchback bot commented Dec 17, 2024 • edited Loading

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

Backporting merged PR #10093 into master

patchback bot commented Dec 17, 2024 • edited Loading

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

Backporting merged PR #10093 into master

bdraco commented Dec 17, 2024

bdraco commented Dec 17, 2024

Use `quote_cookie` setting from ClientSession's cookiejar in `tmp_cookie_jar` #10093

Use `quote_cookie` setting from ClientSession's cookiejar in `tmp_cookie_jar` #10093

codspeed-hq bot commented Dec 2, 2024 •

edited

Loading

codecov bot commented Dec 2, 2024 •

edited

Loading

patchback bot commented Dec 17, 2024 •

edited

Loading

patchback bot commented Dec 17, 2024 •

edited

Loading