bpo-41428: Implementation for PEP 604 #21515

MaggieMoss · 2020-07-17T00:07:17Z

PEP 604 - Proposed Implementation

https://www.python.org/dev/peps/pep-0604/

Building off of the comments left on this PR here: https://github.com/pprados/cpython/tree/PEP604

https://bugs.python.org/issue41428

Objects/typeobject.c

gvanrossum · 2020-07-17T23:54:04Z

Thank you so much! Give me a few days to review this. Ping me if you haven't heard from me by Wednesday!

gvanrossum

Great start! Here's a boatload of review comments, from whitespace nits to feature requests.

Lib/test/test_isinstance.py

Lib/test/test_types.py

Lib/typing.py

Objects/abstract.c

Objects/unionobject.c

gvanrossum

(Presumably you were going to add more commits before asking for another review?)

Lib/test/test_isinstance.py

Objects/abstract.c

Objects/unionobject.c

MaggieMoss · 2020-07-21T01:40:39Z

@gvanrossum thanks so much for the comments! I'll implement your suggestions and clean this up :)

MaggieMoss · 2020-08-20T18:32:14Z

@gvanrossum

I had thought of another case we might need to handle here, and was hoping to get your input. Should this:

typing.Union[int, str] is (int | str)

evaluate to true?

MaggieMoss · 2020-08-23T23:45:39Z

@pablogsal let me know if there are any other changes you'd like to see here.

pablogsal · 2020-08-23T23:47:44Z

@pablogsal let me know if there are any other changes you'd like to see here.

I just need to find some time to do another iteration 😉 Will try to do another pass by tomorrow, but we are very close! Thanks for the patience and tye good work :)

Objects/unionobject.c

Include/unionobject.h

pablogsal · 2020-09-08T23:50:11Z

@MaggieMoss I have pushed a new commit (8c06c1d) to do some simplifications and to fix some minor reference count issues and crashes. Please, check out that everything seems ok in that commit :)

pablogsal

This looks good to me!

Thanks for all the work and patience @MaggieMoss! Great job :)

@gvanrossum I won't land it myself in case you or Maggie want to take a last check.

Objects/unionobject.c

gvanrossum

I think it's good! Thanks so much Maggie for all your work.

MaggieMoss · 2020-09-09T18:00:10Z

Thanks so much for all of your reviews and comments, I've really appreciated it. 🎉

gvanrossum · 2020-09-09T20:11:57Z

@MaggieMoss
I noticed that some tests failed on Windows. Could it be that you need to rebase to the latest master?

"test.test_asyncio.test_sendfile.ProactorEventLoopTests.test_sendfile_close_peer_in_the_middle_of_receiving"

pablogsal · 2020-09-09T20:23:03Z

@MaggieMoss
I noticed that some tests failed on Windows. Could it be that you need to rebase to the latest master?

"test.test_asyncio.test_sendfile.ProactorEventLoopTests.test_sendfile_close_peer_in_the_middle_of_receiving"

That's an unrelated race condition in asyncio in Windows, we can ignore it and just land

gvanrossum · 2020-09-09T20:37:56Z

Congrats Maggie!!

See https://www.python.org/dev/peps/pep-0604/ for more information. Co-authored-by: Pablo Galindo <pablogsal@gmail.com>

- `__or__` was added to `TypeVar` in Python 3.10: https://bugs.python.org/issue41428 (this PR: python/cpython#21515) - `__or__` was added to `ForwardRef` in Python 3.11: https://bugs.python.org/issue45489

MaggieMoss added 10 commits July 10, 2020 15:31

Add new type object for union types

4c4c701

Add test.

07b5c29

Add basic tp_* fields to union object

32c207b

Squash this commit.

50b33c2

Squash this commit.

8901145

Add union_traverse method.

6450321

Handle Py_None in union.

8a09a92

Clean up syntax with Py_None

e3c80e9

Update getattro method.

165c323

Reduce code duplication when adding union types together.

7f0018e

MaggieMoss requested review from gvanrossum, ilevkivskyi and a team as code owners July 17, 2020 00:07

This comment has been minimized.

Sign in to view

the-knights-who-say-ni added the CLA not signed label Jul 17, 2020

bedevere-bot added the awaiting review label Jul 17, 2020

MaggieMoss marked this pull request as draft July 17, 2020 00:07

MaggieMoss referenced this pull request in pprados/cpython Jul 17, 2020

Implement a POC of the specification describe in the PEP0604

e3e99bc

MaggieMoss commented Jul 17, 2020

View reviewed changes

Objects/typeobject.c Outdated Show resolved Hide resolved

MaggieMoss changed the title ~~Pep605 implementation~~ Pep604 - Draft Implementation Jul 17, 2020

MaggieMoss added 4 commits July 16, 2020 20:45

Add __or__ method to _SpecialGenericAlias

cd584d5

Add support for NewType with unions.

ba031c1

Remove old code from abstract.c

e62de73

Fix warning for incompatible pointer type.

f6ab05b

gvanrossum changed the title ~~Pep604 - Draft Implementation~~ PEP 604 - Draft Implementation Jul 18, 2020

gvanrossum reviewed Jul 18, 2020

View reviewed changes

Add support for union use in subclasses.

9c20fbc

gvanrossum reviewed Jul 19, 2020

View reviewed changes

Lib/test/test_isinstance.py Outdated Show resolved Hide resolved

Objects/abstract.c Outdated Show resolved Hide resolved

Objects/unionobject.c Outdated Show resolved Hide resolved

MaggieMoss requested a review from pablogsal August 18, 2020 22:32

pablogsal reviewed Sep 8, 2020

View reviewed changes

Objects/unionobject.c Outdated Show resolved Hide resolved

pablogsal reviewed Sep 8, 2020

View reviewed changes

Include/unionobject.h Outdated Show resolved Hide resolved

General cleanup, fix reference leaks, add new test for possible crashes

8c06c1d

pablogsal added 2 commits September 9, 2020 00:52

Add newline

37699f1

Make unionobject APIs private

47a4cb3

pablogsal approved these changes Sep 9, 2020

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting changes labels Sep 9, 2020

pablogsal reviewed Sep 9, 2020

View reviewed changes

Objects/unionobject.c Outdated Show resolved Hide resolved

Add minor test for GenericAlias

7f89abd

gvanrossum approved these changes Sep 9, 2020

View reviewed changes

Remove ellipsis from repr.

d0be56f

Remove commented out test code.

59f06f7

pablogsal merged commit 1b4552c into python:master Sep 9, 2020

bedevere-bot removed the awaiting merge label Sep 9, 2020

xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020

bpo-41428: Implementation for PEP 604 (pythonGH-21515)

293703d

See https://www.python.org/dev/peps/pep-0604/ for more information. Co-authored-by: Pablo Galindo <pablogsal@gmail.com>

Fidget-Spinner mentioned this pull request Jul 19, 2021

bpo-44662: Add ability to annotate types.Union #27214

Merged

furkanonder mentioned this pull request Mar 28, 2023

gh-60712: Include the "object" type in the lists of documented types #103036

Merged

Uh oh!

bpo-41428: Implementation for PEP 604 #21515

bpo-41428: Implementation for PEP 604 #21515

Uh oh!

Conversation

MaggieMoss commented Jul 17, 2020 • edited by gvanrossum Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PEP 604 - Proposed Implementation

Uh oh!

This comment has been minimized.

Uh oh!

gvanrossum commented Jul 17, 2020

Uh oh!

gvanrossum left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gvanrossum left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MaggieMoss commented Jul 21, 2020

Uh oh!

MaggieMoss commented Aug 20, 2020

Uh oh!

MaggieMoss commented Aug 23, 2020

Uh oh!

pablogsal commented Aug 23, 2020

Uh oh!

Uh oh!

Uh oh!

pablogsal commented Sep 8, 2020

Uh oh!

pablogsal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gvanrossum left a comment

Choose a reason for hiding this comment

Uh oh!

MaggieMoss commented Sep 9, 2020

Uh oh!

gvanrossum commented Sep 9, 2020

Uh oh!

pablogsal commented Sep 9, 2020

Uh oh!

gvanrossum commented Sep 9, 2020 via email

Uh oh!

Uh oh!

MaggieMoss commented Jul 17, 2020 •

edited by gvanrossum

Loading