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

Add runtime type check for ClientSession timeout param #8022

Merged
merged 6 commits into from
Jan 12, 2024

Conversation

igorvoltaic
Copy link
Contributor

@igorvoltaic igorvoltaic commented Jan 11, 2024

What do these changes do?

Handle ClientSession timeout param type properly when creating a client.

Are there changes in behavior for the user?

A ValueError is raised when using something other than ClientTimeout in timeout param.

Related issue number

Fixes #8021

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

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jan 11, 2024
Copy link

codecov bot commented Jan 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (63bea9d) 97.46% compared to head (ca5725f) 97.46%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8022   +/-   ##
=======================================
  Coverage   97.46%   97.46%           
=======================================
  Files         107      107           
  Lines       32548    32551    +3     
  Branches     3790     3793    +3     
=======================================
+ Hits        31722    31725    +3     
  Misses        624      624           
  Partials      202      202           
Flag Coverage Δ
CI-GHA 97.37% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.05% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.55% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.86% <100.00%> (-0.01%) ⬇️
Py-3.10.11 95.47% <100.00%> (+<0.01%) ⬆️
Py-3.10.13 96.85% <100.00%> (+<0.01%) ⬆️
Py-3.11.7 96.60% <100.00%> (+<0.01%) ⬆️
Py-3.12.1 96.64% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.44% <100.00%> (+<0.01%) ⬆️
Py-3.8.18 96.79% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 95.44% <100.00%> (+<0.01%) ⬆️
Py-3.9.18 96.82% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.14 96.38% <100.00%> (+<0.01%) ⬆️
VM-macos 96.86% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.05% <100.00%> (+<0.01%) ⬆️
VM-windows 95.55% <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/client.py Outdated Show resolved Hide resolved
aiohttp/client.py Outdated Show resolved Hide resolved
@Dreamsorcerer Dreamsorcerer added backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot labels Jan 11, 2024
@Dreamsorcerer Dreamsorcerer changed the title Handle ClientSession timeout param types properly Add runtime type check for ClientSession timeout param Jan 12, 2024
@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) January 12, 2024 13:48
@Dreamsorcerer Dreamsorcerer merged commit 43f3e23 into aio-libs:master Jan 12, 2024
30 of 34 checks passed
Copy link
Contributor

patchback bot commented Jan 12, 2024

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

❌ Failed to cleanly apply 43f3e23 on top of patchback/backports/3.9/43f3e23b1c66ad8303fd1333ccb86c2301d07d15/pr-8022

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

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

❌ Failed to cleanly apply 43f3e23 on top of patchback/backports/3.10/43f3e23b1c66ad8303fd1333ccb86c2301d07d15/pr-8022

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

igorvoltaic added a commit to igorvoltaic/aiohttp that referenced this pull request Jan 12, 2024
igorvoltaic added a commit to igorvoltaic/aiohttp that referenced this pull request Jan 12, 2024
igorvoltaic added a commit to igorvoltaic/aiohttp that referenced this pull request Jan 12, 2024
igorvoltaic added a commit to igorvoltaic/aiohttp that referenced this pull request Jan 12, 2024
igorvoltaic added a commit to igorvoltaic/aiohttp that referenced this pull request Jan 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot backport-3.10 Trigger automatic backporting to the 3.10 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.

ClientSession timeout AttributeError
2 participants