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

Deprecate obsolete timeout in ClientSession.ws_connect() #3946

Merged
merged 5 commits into from
Aug 30, 2019
Merged

Deprecate obsolete timeout in ClientSession.ws_connect() #3946

merged 5 commits into from
Aug 30, 2019

Conversation

atemate
Copy link
Contributor

@atemate atemate commented Jul 26, 2019

closes #3945

What do these changes do?

Deprecate obsolete timeout: float and receive_timeout: Optional[float] in ClientSession.ws_connect(). Change default websocket receive timeout from None to 10.0.

Related issue number

#3945

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."

@webknjaz
Copy link
Member

@ayushkovskiy it looks like you use some syntax which is incompatible with Python 3.5: https://travis-ci.com/aio-libs/aiohttp/jobs/220023040#L511

aiohttp/client.py Outdated Show resolved Hide resolved
@asvetlov
Copy link
Member

@webknjaz let's discuss Python 3.5 support in #3947

@webknjaz webknjaz closed this Jul 28, 2019
@webknjaz webknjaz reopened this Jul 28, 2019
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jul 28, 2019
@asvetlov
Copy link
Member

asvetlov commented Aug 1, 2019

@ayushkovskiy Please keep 3.5 compatible syntax for a while: #3947 (comment)

aiohttp/client_utils.py Outdated Show resolved Hide resolved
Artem Yushkovskiy added 2 commits August 8, 2019 19:04
@codecov-io
Copy link

codecov-io commented Aug 8, 2019

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.78%. Comparing base (b3b931a) to head (1c1cc49).
Report is 3754 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3946      +/-   ##
==========================================
+ Coverage   97.67%   97.78%   +0.11%     
==========================================
  Files          43       43              
  Lines        8761     8763       +2     
  Branches     1377     1375       -2     
==========================================
+ Hits         8557     8569      +12     
+ Misses         89       81       -8     
+ Partials      115      113       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

docs/client_reference.rst Outdated Show resolved Hide resolved
aiohttp/client.py Show resolved Hide resolved
aiohttp/client_ws.py Outdated Show resolved Hide resolved
docs/client_reference.rst Outdated Show resolved Hide resolved
Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asvetlov
Copy link
Member

@yjqiang is the latest PR version good to you?

@yjqiang
Copy link

yjqiang commented Aug 16, 2019

@asvetlov 👌

@asvetlov asvetlov merged commit c09c538 into aio-libs:master Aug 30, 2019
@asvetlov
Copy link
Member

thanks!

@Dreamsorcerer Dreamsorcerer added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Aug 31, 2024
Copy link
Contributor

patchback bot commented Aug 31, 2024

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

❌ Failed to cleanly apply c09c538 on top of patchback/backports/3.11/c09c538e036619ae549280fb9051fd6084e8252c/pr-3946

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

Dreamsorcerer pushed a commit that referenced this pull request Aug 31, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 1, 2024
(cherry picked from commit c09c538)

---------

Co-authored-by: Artem Yushkovskiy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 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.

Deprecate obsolete timeout in ClientSession.ws_connect()
6 participants