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.

Sign up for GitHub

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

Jump to bottom

bpo-40296: Fix supporting generic aliases in pydoc #30253

Merged
merged 4 commits into from
Mar 18, 2022
Merged

bpo-40296: Fix supporting generic aliases in pydoc #30253

merged 4 commits into from
Mar 18, 2022

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Dec 25, 2021 •
edited by bedevere-bot
Loading

@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Dec 25, 2021
gvanrossum
gvanrossum approved these changes Jan 11, 2022
View reviewed changes
Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

Looks good. Sorry I took so long for the review!

@gvanrossum
Copy link
Member

@serhiy-storchaka If you still care please merge.

@serhiy-storchaka
Copy link
Member Author

Sorry, I was going to review it myself yet once and maybe add more tests if not all changes are covered.

@serhiy-storchaka
Copy link
Member Author

Will merge after fixing pydoc tests (#31959) and adding some new tests.

@serhiy-storchaka serhiy-storchaka merged commit cd44afc into python:main Mar 18, 2022
@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the pydoc-generic-alias branch March 18, 2022 09:05
@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker cd44afc573e2e2de8d7e5a9119c347373066cd10 3.10

@miss-islington
Copy link
Contributor

Sorry @serhiy-storchaka, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker cd44afc573e2e2de8d7e5a9119c347373066cd10 3.9

@serhiy-storchaka serhiy-storchaka added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes and removed needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Mar 18, 2022
@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker cd44afc573e2e2de8d7e5a9119c347373066cd10 3.9

@miss-islington
Copy link
Contributor

Sorry @serhiy-storchaka, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker cd44afc573e2e2de8d7e5a9119c347373066cd10 3.10

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Mar 18, 2022
@serhiy-storchaka
[3.10] bpo-40296: Fix supporting generic aliases in pydoc (pythonGH-3…
e279a2a 
…0253).

(cherry picked from commit cd44afc)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot
Copy link

GH-31976 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 18, 2022
serhiy-storchaka added a commit that referenced this pull request Mar 18, 2022
@serhiy-storchaka
[3.10] bpo-40296: Fix supporting generic aliases in pydoc (GH-30253). (…
a5b7678 
…GH-31976)

(cherry picked from commit cd44afc)
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 18, 2022
@serhiy-storchaka @miss-islington
[3.10] bpo-40296: Fix supporting generic aliases in pydoc (pythonGH-3…
a85f0cc 
…0253). (pythonGH-31976)

(cherry picked from commit cd44afc)
(cherry picked from commit a5b7678)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka pushed a commit that referenced this pull request Mar 19, 2022
@miss-islington
[3.9] bpo-40296: Fix supporting generic aliases in pydoc (GH-30253). (G…
e207d72 
…H-31976) (GH-31981)

(cherry picked from commit cd44afc)
(cherry picked from commit a5b7678)
@ksunden ksunden mentioned this pull request Mar 25, 2022
Closed
@kernc kernc mentioned this pull request Apr 12, 2022
Open
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@miss-islington @hello-adam
[3.9] bpo-40296: Fix supporting generic aliases in pydoc (pythonGH-30253
0458b29 
). (pythonGH-31976) (pythonGH-31981)

(cherry picked from commit cd44afc)
(cherry picked from commit a5b7678)
@serhiy-storchaka serhiy-storchaka removed the needs backport to 3.9 only security fixes label Nov 10, 2023
@serhiy-storchaka serhiy-storchaka removed their assignment Nov 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes

@raghavthind2005 raghavthind2005 raghavthind2005 approved these changes

Assignees
No one assigned
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@serhiy-storchaka @gvanrossum @miss-islington @bedevere-bot @raghavthind2005 @the-knights-who-say-ni