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 URL params to ClientSession.ws_connect #5869

Merged
merged 6 commits into from
Oct 27, 2021
Merged

Add URL params to ClientSession.ws_connect #5869

merged 6 commits into from
Oct 27, 2021

Conversation

hoh
Copy link
Contributor

@hoh hoh commented Jul 9, 2021

What do these changes do?

These changes add the params argument to ClientSession.ws_connect, so WebSocket requests can contain a query component.

Are there changes in behavior for the user?

Yes, this adds an extra keyword argument on ClientSession.ws_connect. The change is backward compatible.

Related issue number

#5868

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • Already in CONTRIBUTORS.txt
  • Add a new news fragment into the CHANGES folder

@hoh hoh requested review from asvetlov and webknjaz as code owners July 9, 2021 09:44
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jul 9, 2021
CHANGES/5868.bugfix Outdated Show resolved Hide resolved
CHANGES/5868.bugfix Outdated Show resolved Hide resolved
@hoh hoh requested a review from anesabml October 15, 2021 10:08
CHANGES/5868.bugfix 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 asvetlov enabled auto-merge (squash) October 27, 2021 16:44
@asvetlov asvetlov merged commit b8f4d70 into aio-libs:master Oct 27, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 27, 2021

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

❌ Failed to cleanly apply b8f4d70 on top of patchback/backports/3.8/b8f4d70e63f54cf5f32961f2e2bc2690b52a3c90/pr-5869

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

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

asvetlov added a commit that referenced this pull request Oct 27, 2021
* Fix URL params were unavailable in ws_connect (#5868)

* Update CHANGES/5868.bugfix

Co-authored-by: Anes Abismail <[email protected]>

* Update 5868.bugfix

Co-authored-by: Anes Abismail <[email protected]>
Co-authored-by: Andrew Svetlov <[email protected]>
@asvetlov
Copy link
Member

Backported by 708dd98

@hoh
Copy link
Contributor Author

hoh commented Oct 27, 2021

Thank you Andrew !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants