Skip to content

gh-112281: Allow Union with unhashable Annotated metadata#112283

Merged
AlexWaygood merged 13 commits intopython:mainfrom
sobolevn:issue-112281
Mar 1, 2024
Merged

gh-112281: Allow Union with unhashable Annotated metadata#112283
AlexWaygood merged 13 commits intopython:mainfrom
sobolevn:issue-112281

Conversation

@sobolevn
Copy link
Copy Markdown
Member

@sobolevn sobolevn commented Nov 20, 2023 •
edited by bedevere-app Bot
Loading

This should not affect performance that much:

  1. I tried to keep the fast path as it is
  2. Slow path is only used when TypeError happens on unhashable items (it should not affect code with only hashable parts)

@bedevere-app bedevere-app Bot mentioned this pull request Nov 20, 2023
Closed
faph
faph reviewed Nov 20, 2023
View reviewed changes
Comment thread Lib/typing.py Outdated
AlexWaygood
AlexWaygood reviewed Nov 20, 2023
View reviewed changes
Comment thread Lib/test/test_typing.py Outdated
JelleZijlstra
JelleZijlstra reviewed Nov 25, 2023
View reviewed changes
Comment thread Lib/typing.py Outdated
Comment thread Lib/typing.py Outdated
Comment thread Lib/test/test_typing.py
Comment thread Lib/test/test_typing.py Outdated
Comment thread Misc/NEWS.d/next/Library/2023-11-20-16-15-44.gh-issue-112281.gH4EVk.rst Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/typing.py Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/typing.py Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/typing.py Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/test/test_typing.py Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/test/test_types.py Outdated
AlexWaygood
AlexWaygood reviewed Dec 2, 2023
View reviewed changes
Comment thread Lib/test/test_typing.py Outdated
Comment thread Lib/test/test_typing.py Outdated
@sobolevn
Copy link
Copy Markdown
Member Author

sobolevn commented Dec 2, 2023

We just did 6 rounds of nitpicks :)

AlexWaygood
AlexWaygood approved these changes Dec 2, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

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

LGTM. @JelleZijlstra, anything more from you?

Comment thread Lib/test/test_typing.py Outdated
@sobolevn sobolevn requested a review from AlexWaygood February 7, 2024 07:06
@AlexWaygood
Copy link
Copy Markdown
Member

AlexWaygood commented Feb 7, 2024

I already approved this one :)

@AlexWaygood AlexWaygood removed their request for review February 7, 2024 12:48
@JelleZijlstra
Copy link
Copy Markdown
Member

JelleZijlstra commented Mar 1, 2024

Thanks, and sorry for the wait!

Do you think this should be backported? I lean yes because the old behavior feels like a bug.

@AlexWaygood
Copy link
Copy Markdown
Member

AlexWaygood commented Mar 1, 2024

Do you think this should be backported? I lean yes because the old behavior feels like a bug.

Yeah, agreed

@AlexWaygood AlexWaygood added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Mar 1, 2024
@AlexWaygood AlexWaygood enabled auto-merge (squash) March 1, 2024 15:46
@AlexWaygood AlexWaygood merged commit a7549b0 into python:main Mar 1, 2024
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app Bot commented Mar 1, 2024

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 1, 2024
@sobolevn @AlexWaygood @miss-islington
pythongh-112281: Allow Union with unhashable Annotated metadata (p…
21cad08 
…ythonGH-112283)

(cherry picked from commit a7549b0)

Co-authored-by: Nikita Sobolev <[email protected]>
Co-authored-by: Alex Waygood <[email protected]>
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app Bot commented Mar 1, 2024

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker a7549b03cec1699b5342cddf292c179315433fa2 3.11

@bedevere-app
Copy link
Copy Markdown

bedevere-app Bot commented Mar 1, 2024

GH-116213 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Mar 1, 2024
AlexWaygood added a commit that referenced this pull request Mar 1, 2024
@miss-islington @sobolevn @AlexWaygood
[3.12] gh-112281: Allow Union with unhashable Annotated metadata (G…
90f75e1 
…H-112283) (#116213)

Co-authored-by: Nikita Sobolev <[email protected]>
Co-authored-by: Alex Waygood <[email protected]>
@AlexWaygood AlexWaygood assigned sobolevn and unassigned AlexWaygood Mar 1, 2024
sobolevn added a commit to sobolevn/cpython that referenced this pull request Mar 3, 2024
@sobolevn @AlexWaygood
[3.11] pythongh-112281: Allow Union with unhashable Annotated met…
5612315 
…adata (pythonGH-112283)

(cherry picked from commit a7549b0)

Co-authored-by: Nikita Sobolev <[email protected]>
Co-authored-by: Alex Waygood <[email protected]>
@bedevere-app
Copy link
Copy Markdown

bedevere-app Bot commented Mar 3, 2024

GH-116288 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.11 only security fixes label Mar 3, 2024
AlexWaygood added a commit that referenced this pull request Mar 3, 2024
@sobolevn @AlexWaygood
[3.11] gh-112281: Allow Union with unhashable Annotated metadata (G…
8bfbeeb 
…H-112283) (#116288)

Co-authored-by: Alex Waygood <[email protected]>
woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
@sobolevn @AlexWaygood @woodruffw
pythongh-112281: Allow Union with unhashable Annotated metadata (p…
326fad4 
…ython#112283)

Co-authored-by: Alex Waygood <[email protected]>
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@sobolevn @AlexWaygood @adorilson
pythongh-112281: Allow Union with unhashable Annotated metadata (p…
6b0c1c2 
…ython#112283)

Co-authored-by: Alex Waygood <[email protected]>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@sobolevn @AlexWaygood @diegorusso
pythongh-112281: Allow Union with unhashable Annotated metadata (p…
2b44ae1 
…ython#112283)

Co-authored-by: Alex Waygood <[email protected]>
@JelleZijlstra JelleZijlstra mentioned this pull request Apr 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes

@AlexWaygood AlexWaygood AlexWaygood approved these changes

+1 more reviewer

@faph faph faph left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@sobolevn sobolevn

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sobolevn @AlexWaygood @JelleZijlstra @faph