Skip filtering `CookieJar` when the jar is empty or all cookies have expired #7819

Rongronggg9 · 2023-11-11T20:50:21Z

What do these changes do?

The filtering itself and its preparation in CookieJar.filter_cookies() is expensive. Sometimes there are no cookies in the jar or all cookies have expired. Skip filtering and its preparation in this case.

Because the empty check is much cheaper than _do_expiration(), I think it deserves to be duplicated before and after calling _do_expiration().

$ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict(foo="bar")' \
> 'if not d: pass'
50000000 loops, best of 5: 8.3 nsec per loop
$ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict()' \
> 'if not d: pass'
50000000 loops, best of 5: 8.74 nsec per loop
$ python3.11 -m timeit -s 'from aiohttp import CookieJar; cj = CookieJar()' \
> 'cj._do_expiration()'
200000 loops, best of 5: 1.86 usec per loop

Are there changes in behavior for the user?

No.

Related issue number

#7583 (comment)

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
- The format is <Name> <Surname>.
- Please keep alphabetical order, the file is sorted by names.
Add a new news fragment into the CHANGES folder
- name it <issue_id>.<type> for example (588.bugfix)
- if you don't have an issue_id change it to the pr id after creating the pr
- ensure type is one of the following:
  - .feature: Signifying a new feature.
  - .bugfix: Signifying a bug fix.
  - .doc: Signifying a documentation improvement.
  - .removal: Signifying a deprecation or removal of public API.
  - .misc: A ticket has been closed, but it is not of interest to users.
- Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

…e expired

Dreamsorcerer · 2023-11-11T22:28:20Z

This looks like it's probably OK. But, we might want to look at seeing if we can replace datetime. In my quick tests with an empty cookiejar, the datetime operations are taking around 60% of the time in .clear() (with or without a predicate).

bdraco · 2023-11-11T22:31:10Z

This looks like it's probably OK. But, we might want to look at seeing if we can replace datetime. In my quick tests with an empty cookiejar, the datetime operations are taking around 60% of the time in .clear() (with or without a predicate).

Good idea. time.time() should be much faster here for comparisons

Rongronggg9 · 2023-11-12T08:35:03Z

But, we might want to look at seeing if we can replace datetime.

Sure. Would you like me to update the PR to make it contain a bunch of optimizations? Or just open a new one?

As for what we have discussed in #7583 and here, plus those optimizations I thought of when I read the code, we can:

Skip filtering CookieJar when the jar is empty or all cookies have expired (this PR)
Skip filtering if not CookieJar._unsafe and is_ip_address(hostname) (CookieJar improvements #7583 (comment))
Replace the usage of datetime with time
Only call request_url.origin() when we really need it (request_url.scheme not in ("https", "wss") and self._treat_as_secure_origin is not empty)

I think we can let 1,2,4 go to this PR since they are quite straightforward, and 3 go to another one?

Dreamsorcerer · 2023-11-12T12:29:26Z

Sure. Would you like me to update the PR to make it contain a bunch of optimizations? Or just open a new one?

Probably new ones, we can do them in steps.

aiohttp/cookiejar.py

codecov · 2023-11-12T12:46:02Z

Codecov Report

Merging #7819 (fd65674) into master (7ed2dd3) will decrease coverage by 0.01%.
The diff coverage is 60.00%.

@@            Coverage Diff             @@
##           master    #7819      +/-   ##
==========================================
- Coverage   97.42%   97.41%   -0.01%     
==========================================
  Files         106      106              
  Lines       32111    32115       +4     
  Branches     3726     3728       +2     
==========================================
+ Hits        31283    31285       +2     
- Misses        626      627       +1     
- Partials      202      203       +1

Flag	Coverage Δ
CI-GHA	`97.33% <60.00%> (-0.01%)`	⬇️
OS-Linux	`97.01% <60.00%> (-0.01%)`	⬇️
OS-Windows	`95.50% <60.00%> (-0.01%)`	⬇️
OS-macOS	`96.68% <60.00%> (-0.01%)`	⬇️
Py-3.10.11	`95.42% <60.00%> (-0.01%)`	⬇️
Py-3.10.13	`96.86% <60.00%> (-0.02%)`	⬇️
Py-3.11.6	`96.52% <60.00%> (-0.01%)`	⬇️
Py-3.12.0	`96.59% <60.00%> (-0.01%)`	⬇️
Py-3.8.10	`95.39% <60.00%> (-0.01%)`	⬇️
Py-3.8.18	`96.79% <60.00%> (-0.01%)`	⬇️
Py-3.9.13	`95.39% <60.00%> (-0.01%)`	⬇️
Py-3.9.18	`96.83% <60.00%> (-0.01%)`	⬇️
Py-pypy7.3.11	`96.23% <60.00%> (-0.02%)`	⬇️
VM-macos	`96.68% <60.00%> (-0.01%)`	⬇️
VM-ubuntu	`97.01% <60.00%> (-0.01%)`	⬇️
VM-windows	`95.50% <60.00%> (-0.01%)`	⬇️

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

Files	Coverage Δ
aiohttp/cookiejar.py	`98.07% <60.00%> (-0.76%)`	⬇️

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

patchback · 2023-11-12T12:55:17Z

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

❌ Failed to cleanly apply dfc3f89 on top of patchback/backports/3.9/dfc3f899e5b81997a343b227100781f4c39a3464/pr-7819

Backporting merged PR #7819 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.9/dfc3f899e5b81997a343b227100781f4c39a3464/pr-7819 upstream/3.9

Now, cherry-pick PR Skip filtering CookieJar when the jar is empty or all cookies have expired #7819 contents into that branch:
```
$ git cherry-pick -x dfc3f899e5b81997a343b227100781f4c39a3464
```
If it'll yell at you with something like fatal: Commit dfc3f899e5b81997a343b227100781f4c39a3464 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x dfc3f899e5b81997a343b227100781f4c39a3464
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Skip filtering CookieJar when the jar is empty or all cookies have expired #7819 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/dfc3f899e5b81997a343b227100781f4c39a3464/pr-7819

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 · 2023-11-12T13:44:26Z

If you can handle the backport with the above instructions, that'd be really helpful.

Rongronggg9 · 2023-11-12T14:23:35Z

Sure. I will backport it later.

…e expired (aio-libs#7819) The filtering itself and its preparation in `CookieJar.filter_cookies()` is expensive. Sometimes there are no cookies in the jar or all cookies have expired. Skip filtering and its preparation in this case. Because the empty check is much cheaper than `_do_expiration()`, I think it deserves to be duplicated before and after calling `_do_expiration()`. ```console $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict(foo="bar")' \ > 'if not d: pass' 50000000 loops, best of 5: 8.3 nsec per loop $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict()' \ > 'if not d: pass' 50000000 loops, best of 5: 8.74 nsec per loop $ python3.11 -m timeit -s 'from aiohttp import CookieJar; cj = CookieJar()' \ > 'cj._do_expiration()' 200000 loops, best of 5: 1.86 usec per loop ``` (cherry picked from commit dfc3f89)

…he jar is empty or all cookies have expired (#7822) **This is a backport of PR #7819 as merged into master (dfc3f89).**  ## What do these changes do? The filtering itself and its preparation in `CookieJar.filter_cookies()` is expensive. Sometimes there are no cookies in the jar or all cookies have expired. Skip filtering and its preparation in this case. Because the empty check is much cheaper than `_do_expiration()`, I think it deserves to be duplicated before and after calling `_do_expiration()`. ```console $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict(foo="bar")' \ > 'if not d: pass' 50000000 loops, best of 5: 8.3 nsec per loop $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict()' \ > 'if not d: pass' 50000000 loops, best of 5: 8.74 nsec per loop $ python3.11 -m timeit -s 'from aiohttp import CookieJar; cj = CookieJar()' \ > 'cj._do_expiration()' 200000 loops, best of 5: 1.86 usec per loop ```  ## Are there changes in behavior for the user? No.  ## Related issue number #7583 (comment)  ## Checklist - [x] I think the code is well written - [ ] Unit tests for the changes exist - [ ] Documentation reflects the changes - [x] If you provide code modification, please add yourself to `CONTRIBUTORS.txt` * The format is <Name> <Surname>. * Please keep alphabetical order, the file is sorted by names. - [x] Add a new news fragment into the `CHANGES` folder * name it `<issue_id>.<type>` for example (588.bugfix) * if you don't have an `issue_id` change it to the pr id after creating the pr * ensure type is one of the following: * `.feature`: Signifying a new feature. * `.bugfix`: Signifying a bug fix. * `.doc`: Signifying a documentation improvement. * `.removal`: Signifying a deprecation or removal of public API. * `.misc`: A ticket has been closed, but it is not of interest to users. * Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

… in CookieJar (#7824) #7583 #7819 (comment)

… in CookieJar (#7824) #7819 (comment) (cherry picked from commit 8ae650b)

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [aiohttp](https://togithub.com/aio-libs/aiohttp) | `==3.8.6` -> `==3.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>aio-libs/aiohttp (aiohttp)</summary> ### [`v3.9.0`](https://togithub.com/aio-libs/aiohttp/blob/HEAD/CHANGES.rst#390-2023-11-18) [Compare Source](https://togithub.com/aio-libs/aiohttp/compare/v3.8.6...v3.9.0) \================== ## Features - Introduced `AppKey` for static typing support of `Application` storage. See https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config `#5864 <https://github.com/aio-libs/aiohttp/issues/5864>`\_ - Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the `shutdown_timeout` parameter. -- by :user:`Dreamsorcerer`. See https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown `#7188 <https://github.com/aio-libs/aiohttp/issues/7188>`\_ - Added `handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation>`\_ parameter to cancel web handler on client disconnection. -- by :user:`mosquito` This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks. `#7056 <https://github.com/aio-libs/aiohttp/issues/7056>`\_ - Added support for setting response header parameters `max_line_size` and `max_field_size`. `#2304 <https://github.com/aio-libs/aiohttp/issues/2304>`\_ - Added `auto_decompress` parameter to `ClientSession.request` to override `ClientSession._auto_decompress`. -- by :user:`Daste745` `#3751 <https://github.com/aio-libs/aiohttp/issues/3751>`\_ - Changed `raise_for_status` to allow a coroutine. `#3892 <https://github.com/aio-libs/aiohttp/issues/3892>`\_ - Added client brotli compression support (optional with runtime check). `#5219 <https://github.com/aio-libs/aiohttp/issues/5219>`\_ - Added `client_max_size` to `BaseRequest.clone()` to allow overriding the request body size. -- :user:`anesabml`. `#5704 <https://github.com/aio-libs/aiohttp/issues/5704>`\_ - Added a middleware type alias `aiohttp.typedefs.Middleware`. `#5898 <https://github.com/aio-libs/aiohttp/issues/5898>`\_ - Exported `HTTPMove` which can be used to catch any redirection request that has a location -- :user:`dreamsorcerer`. `#6594 <https://github.com/aio-libs/aiohttp/issues/6594>`\_ - Changed the `path` parameter in `web.run_app()` to accept a `pathlib.Path` object. `#6839 <https://github.com/aio-libs/aiohttp/issues/6839>`\_ - Performance: Skipped filtering `CookieJar` when the jar is empty or all cookies have expired. `#7819 <https://github.com/aio-libs/aiohttp/issues/7819>`\_ - Performance: Only check origin if insecure scheme and there are origins to treat as secure, in `CookieJar.filter_cookies()`. `#7821 <https://github.com/aio-libs/aiohttp/issues/7821>`\_ - Performance: Used timestamp instead of `datetime` to achieve faster cookie expiration in `CookieJar`. `#7824 <https://github.com/aio-libs/aiohttp/issues/7824>`\_ - Added support for passing a custom server name parameter to HTTPS connection. `#7114 <https://github.com/aio-libs/aiohttp/issues/7114>`\_ - Added support for using Basic Auth credentials from :file:`.netrc` file when making HTTP requests with the :py:class:`~aiohttp.ClientSession` `trust_env` argument is set to `True`. -- by :user:`yuvipanda`. `#7131 <https://github.com/aio-libs/aiohttp/issues/7131>`\_ - Turned access log into no-op when the logger is disabled. `#7240 <https://github.com/aio-libs/aiohttp/issues/7240>`\_ - Added typing information to `RawResponseMessage`. -- by :user:`Gobot1234` `#7365 <https://github.com/aio-libs/aiohttp/issues/7365>`\_ - Removed `async-timeout` for Python 3.11+ (replaced with `asyncio.timeout()` on newer releases). `#7502 <https://github.com/aio-libs/aiohttp/issues/7502>`\_ - Added support for `brotlicffi` as an alternative to `brotli` (fixing Brotli support on PyPy). `#7611 <https://github.com/aio-libs/aiohttp/issues/7611>`\_ - Added `WebSocketResponse.get_extra_info()` to access a protocol transport's extra info. `#7078 <https://github.com/aio-libs/aiohttp/issues/7078>`\_ - Allow `link` argument to be set to None/empty in HTTP 451 exception. `#7689 <https://github.com/aio-libs/aiohttp/issues/7689>`\_ ## Bugfixes - Implemented stripping the trailing dots from fully-qualified domain names in `Host` headers and TLS context when acting as an HTTP client. This allows the client to connect to URLs with FQDN host name like `https://example.com./`. \-- by :user:`martin-sucha`. `#3636 <https://github.com/aio-libs/aiohttp/issues/3636>`\_ - Fixed client timeout not working when incoming data is always available without waiting. -- by :user:`Dreamsorcerer`. `#5854 <https://github.com/aio-libs/aiohttp/issues/5854>`\_ - Fixed `readuntil` to work with a delimiter of more than one character. `#6701 <https://github.com/aio-libs/aiohttp/issues/6701>`\_ - Added `__repr__` to `EmptyStreamReader` to avoid `AttributeError`. `#6916 <https://github.com/aio-libs/aiohttp/issues/6916>`\_ - Fixed bug when using `TCPConnector` with `ttl_dns_cache=0`. `#7014 <https://github.com/aio-libs/aiohttp/issues/7014>`\_ - Fixed response returned from expect handler being thrown away. -- by :user:`Dreamsorcerer` `#7025 <https://github.com/aio-libs/aiohttp/issues/7025>`\_ - Avoided raising `UnicodeDecodeError` in multipart and in HTTP headers parsing. `#7044 <https://github.com/aio-libs/aiohttp/issues/7044>`\_ - Changed `sock_read` timeout to start after writing has finished, avoiding read timeouts caused by an unfinished write. -- by :user:`dtrifiro` `#7149 <https://github.com/aio-libs/aiohttp/issues/7149>`\_ - Fixed missing query in tracing method URLs when using `yarl` 1.9+. `#7259 <https://github.com/aio-libs/aiohttp/issues/7259>`\_ - Changed max 32-bit timestamp to an aware datetime object, for consistency with the non-32-bit one, and to avoid a `DeprecationWarning` on Python 3.12. `#7302 <https://github.com/aio-libs/aiohttp/issues/7302>`\_ - Fixed `EmptyStreamReader.iter_chunks()` never ending. -- by :user:`mind1m` `#7616 <https://github.com/aio-libs/aiohttp/issues/7616>`\_ - Fixed a rare `RuntimeError: await wasn't used with future` exception. -- by :user:`stalkerg` `#7785 <https://github.com/aio-libs/aiohttp/issues/7785>`\_ - Fixed issue with insufficient HTTP method and version validation. `#7700 <https://github.com/aio-libs/aiohttp/issues/7700>`\_ - Added check to validate that absolute URIs have schemes. `#7712 <https://github.com/aio-libs/aiohttp/issues/7712>`\_ - Fixed unhandled exception when Python HTTP parser encounters unpaired Unicode surrogates. `#7715 <https://github.com/aio-libs/aiohttp/issues/7715>`\_ - Updated parser to disallow invalid characters in header field names and stop accepting LF as a request line separator. `#7719 <https://github.com/aio-libs/aiohttp/issues/7719>`\_ - Fixed Python HTTP parser not treating 204/304/1xx as an empty body. `#7755 <https://github.com/aio-libs/aiohttp/issues/7755>`\_ - Ensure empty body response for 1xx/204/304 per RFC 9112 sec 6.3. `#7756 <https://github.com/aio-libs/aiohttp/issues/7756>`\_ - Fixed an issue when a client request is closed before completing a chunked payload. -- by :user:`Dreamsorcerer` `#7764 <https://github.com/aio-libs/aiohttp/issues/7764>`\_ - Edge Case Handling for ResponseParser for missing reason value. `#7776 <https://github.com/aio-libs/aiohttp/issues/7776>`\_ - Fixed `ClientWebSocketResponse.close_code` being erroneously set to `None` when there are concurrent async tasks receiving data and closing the connection. `#7306 <https://github.com/aio-libs/aiohttp/issues/7306>`\_ - Added HTTP method validation. `#6533 <https://github.com/aio-libs/aiohttp/issues/6533>`\_ - Fixed arbitrary sequence types being allowed to inject values via version parameter. -- by :user:`Dreamsorcerer` `#7835 <https://github.com/aio-libs/aiohttp/issues/7835>`\_ - Performance: Fixed increase in latency with small messages from websocket compression changes. `#7797 <https://github.com/aio-libs/aiohttp/issues/7797>`\_ ## Improved Documentation - Fixed the `ClientResponse.release`'s type in the doc. Changed from `comethod` to `method`. `#5836 <https://github.com/aio-libs/aiohttp/issues/5836>`\_ - Added information on behavior of base_url parameter in `ClientSession`. `#6647 <https://github.com/aio-libs/aiohttp/issues/6647>`\_ - Fixed `ClientResponseError` docs. `#6700 <https://github.com/aio-libs/aiohttp/issues/6700>`\_ - Updated Redis code examples to follow the latest API. `#6907 <https://github.com/aio-libs/aiohttp/issues/6907>`\_ - Added a note about possibly needing to update headers when using `on_response_prepare`. -- by :user:`Dreamsorcerer` `#7283 <https://github.com/aio-libs/aiohttp/issues/7283>`\_ - Completed `trust_env` parameter description to honor `wss_proxy`, `ws_proxy` or `no_proxy` env. `#7325 <https://github.com/aio-libs/aiohttp/issues/7325>`\_ - Expanded SSL documentation with more examples (e.g. how to use certifi). -- by :user:`Dreamsorcerer` `#7334 <https://github.com/aio-libs/aiohttp/issues/7334>`\_ - Fix, update, and improve client exceptions documentation. `#7733 <https://github.com/aio-libs/aiohttp/issues/7733>`\_ ## Deprecations and Removals - Added `shutdown_timeout` parameter to `BaseRunner`, while deprecating `shutdown_timeout` parameter from `BaseSite`. -- by :user:`Dreamsorcerer` `#7718 <https://github.com/aio-libs/aiohttp/issues/7718>`\_ - Dropped Python 3.6 support. `#6378 <https://github.com/aio-libs/aiohttp/issues/6378>`\_ - Dropped Python 3.7 support. -- by :user:`Dreamsorcerer` `#7336 <https://github.com/aio-libs/aiohttp/issues/7336>`\_ - Removed support for abandoned `tokio` event loop. -- by :user:`Dreamsorcerer` `#7281 <https://github.com/aio-libs/aiohttp/issues/7281>`\_ ## Misc - Made `print` argument in `run_app()` optional. `#3690 <https://github.com/aio-libs/aiohttp/issues/3690>`\_ - Improved performance of `ceil_timeout` in some cases. `#6316 <https://github.com/aio-libs/aiohttp/issues/6316>`\_ - Changed importing Gunicorn to happen on-demand, decreasing import time by ~53%. -- :user:`Dreamsorcerer` `#6591 <https://github.com/aio-libs/aiohttp/issues/6591>`\_ - Improved import time by replacing `http.server` with `http.HTTPStatus`. `#6903 <https://github.com/aio-libs/aiohttp/issues/6903>`\_ - Fixed annotation of `ssl` parameter to disallow `True`. -- by :user:`Dreamsorcerer`. `#7335 <https://github.com/aio-libs/aiohttp/issues/7335>`\_ *** </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/allenporter/pyrainbird).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…` when the jar is empty or all cookies have expired (aio-libs#7822) **This is a backport of PR aio-libs#7819 as merged into master (dfc3f89).**  The filtering itself and its preparation in `CookieJar.filter_cookies()` is expensive. Sometimes there are no cookies in the jar or all cookies have expired. Skip filtering and its preparation in this case. Because the empty check is much cheaper than `_do_expiration()`, I think it deserves to be duplicated before and after calling `_do_expiration()`. ```console $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict(foo="bar")' \ > 'if not d: pass' 50000000 loops, best of 5: 8.3 nsec per loop $ python3.11 -m timeit -s 'from collections import defaultdict; d=defaultdict()' \ > 'if not d: pass' 50000000 loops, best of 5: 8.74 nsec per loop $ python3.11 -m timeit -s 'from aiohttp import CookieJar; cj = CookieJar()' \ > 'cj._do_expiration()' 200000 loops, best of 5: 1.86 usec per loop ```  No.  aio-libs#7583 (comment)  - [x] I think the code is well written - [ ] Unit tests for the changes exist - [ ] Documentation reflects the changes - [x] If you provide code modification, please add yourself to `CONTRIBUTORS.txt` * The format is <Name> <Surname>. * Please keep alphabetical order, the file is sorted by names. - [x] Add a new news fragment into the `CHANGES` folder * name it `<issue_id>.<type>` for example (588.bugfix) * if you don't have an `issue_id` change it to the pr id after creating the pr * ensure type is one of the following: * `.feature`: Signifying a new feature. * `.bugfix`: Signifying a bug fix. * `.doc`: Signifying a documentation improvement. * `.removal`: Signifying a deprecation or removal of public API. * `.misc`: A ticket has been closed, but it is not of interest to users. * Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

Skip filtering CookieJar when the jar is empty or all cookies hav…

0bd8c4a

…e expired

Rongronggg9 requested review from webknjaz and asvetlov as code owners November 11, 2023 20:50

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 11, 2023

Dreamsorcerer requested a review from bdraco November 11, 2023 22:26

Dreamsorcerer reviewed Nov 12, 2023

View reviewed changes

aiohttp/cookiejar.py Outdated Show resolved Hide resolved

Update aiohttp/cookiejar.py

fd65674

Dreamsorcerer added the backport-3.9 label Nov 12, 2023

Dreamsorcerer enabled auto-merge (squash) November 12, 2023 12:33

Dreamsorcerer merged commit dfc3f89 into aio-libs:master Nov 12, 2023
27 of 32 checks passed

Rongronggg9 mentioned this pull request Nov 12, 2023

Only check origin if insecure scheme and there are origins to treat as secure, in CookieJar.filter_cookies() #7821

Merged

5 tasks

Rongronggg9 mentioned this pull request Nov 12, 2023

[PR #7819/dfc3f899 backport][3.9] Skip filtering CookieJar when the jar is empty or all cookies have expired #7822

Merged

5 tasks

Rongronggg9 mentioned this pull request Nov 12, 2023

Use timestamp instead of datetime to achieve faster cookie expiration in CookieJar #7824

Merged

5 tasks

patchback bot mentioned this pull request Nov 12, 2023

[PR #7821/366ba40f backport][3.9] Only check origin if insecure scheme and there are origins to treat as secure, in CookieJar.filter_cookies() #7825

Merged

5 tasks

Dreamsorcerer pushed a commit that referenced this pull request Nov 14, 2023

Use timestamp instead of datetime to achieve faster cookie expiration…

8ae650b

… in CookieJar (#7824) #7583 #7819 (comment)

Dreamsorcerer pushed a commit that referenced this pull request Nov 14, 2023

Use timestamp instead of datetime to achieve faster cookie expiration…

a1ad723

… in CookieJar (#7824) #7819 (comment) (cherry picked from commit 8ae650b)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skip filtering `CookieJar` when the jar is empty or all cookies have expired #7819

Skip filtering `CookieJar` when the jar is empty or all cookies have expired #7819

Rongronggg9 commented Nov 11, 2023 •

edited

Loading

Dreamsorcerer commented Nov 11, 2023

bdraco commented Nov 11, 2023

Rongronggg9 commented Nov 12, 2023 •

edited

Loading

Dreamsorcerer commented Nov 12, 2023

codecov bot commented Nov 12, 2023 •

edited

Loading

patchback bot commented Nov 12, 2023 •

edited

Loading

Dreamsorcerer commented Nov 12, 2023

Rongronggg9 commented Nov 12, 2023

Skip filtering CookieJar when the jar is empty or all cookies have expired #7819

Skip filtering CookieJar when the jar is empty or all cookies have expired #7819

Conversation

Rongronggg9 commented Nov 11, 2023 • edited Loading

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

Dreamsorcerer commented Nov 11, 2023

bdraco commented Nov 11, 2023

Rongronggg9 commented Nov 12, 2023 • edited Loading

Dreamsorcerer commented Nov 12, 2023

codecov bot commented Nov 12, 2023 • edited Loading

Codecov Report

patchback bot commented Nov 12, 2023 • edited Loading

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

Backporting merged PR #7819 into master

Dreamsorcerer commented Nov 12, 2023

Rongronggg9 commented Nov 12, 2023

Skip filtering `CookieJar` when the jar is empty or all cookies have expired #7819

Skip filtering `CookieJar` when the jar is empty or all cookies have expired #7819

Rongronggg9 commented Nov 11, 2023 •

edited

Loading

Rongronggg9 commented Nov 12, 2023 •

edited

Loading

codecov bot commented Nov 12, 2023 •

edited

Loading

patchback bot commented Nov 12, 2023 •

edited

Loading