bpo-44654: Refactor and clean up the union type implementation #27196
Conversation
serhiy-storchaka
requested review from
gvanrossum,
ilevkivskyi and
markshannon
as code owners
| { | ||
| _Py_IDENTIFIER(__module__); | ||
| PyObject *module; | ||
| if (_PyObject_LookupAttrId(obj, &PyId___module__, &module) < 0) { |
There was a problem hiding this comment.
The main effect of this change is that it no longer raises AttributeError for types without __module__.
|
Serhiy, please see #27203 where I backported another PR's refactoring changes to 3.10. Without that PR this one won't be able to land in 3.10. |
| PyAPI_DATA(PyTypeObject) _Py_UnionType; | ||
| PyAPI_FUNC(PyObject *) _Py_union_type_or(PyObject* self, PyObject* param); | ||
| PyAPI_DATA(PyTypeObject) _PyUnion_Type; | ||
| #define _PyUnion_Check(op) Py_IS_TYPE(op, &_PyUnion_Type) |
There was a problem hiding this comment.
What do you think about naming this _PyUnion_CheckExact instead? I know we don't have subtypes now but that could change in the future (it changed with GenericAlias).
There was a problem hiding this comment.
If we change it in future, the code will still use _PyUnion_Check instead of _PyUnion_CheckExact. So it is better to name it _PyUnion_Check now.
| if (b_set == NULL) { | ||
| goto exit; |
There was a problem hiding this comment.
I'm shocked at how much simpler this is and how it still passes the types.Union[] == typing.Union[] tests. This work because after your Py_RETURN_NOTIMPLEMENTED, Python then looks into typing.Union's __eq__ right?
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10. |
|
GH-27219 is a backport of this pull request to the 3.10 branch. |
…nGH-27196) (cherry picked from commit 0fd2737) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
* origin/main: (1146 commits) bpo-42064: Finalise establishing sqlite3 global state (pythonGH-27155) bpo-44678: Separate error message for discontinuous padding in binascii.a2b_base64 strict mode (pythonGH-27249) correct spelling (pythonGH-27076) bpo-44524: Add missed __name__ and __qualname__ to typing module objects (python#27237) bpo-27513: email.utils.getaddresses() now handles Header objects (python#13797) Clean up comma usage in Doc/library/functions.rst (python#27083) bpo-42238: Fix small rst issue in NEWS.d/. (python#27238) bpo-41972: Tweak fastsearch.h string search algorithms (pythonGH-27091) bpo-44340: Add support for building with clang full/thin lto (pythonGH-27231) bpo-44661: Update property_descr_set to use vectorcall if possible. (pythonGH-27206) bpo-44645: Check for interrupts on any potentially backwards edge (pythonGH-27216) bpo-41546: make pprint (like print) not write to stdout when it is None (pythonGH-26810) bpo-44554: refactor pdb targets (and internal tweaks) (pythonGH-26992) bpo-43086: Add handling for out-of-spec data in a2b_base64 (pythonGH-24402) bpo-44561: Update hyperlinks in Doc/distributing/index.rst (python#27032) bpo-42355: symtable.get_namespace() now checks whether there are multiple or any namespaces found (pythonGH-23278) bpo-44654: Do not export the union type related symbols (pythonGH-27223) bpo-44633: Fix parameter substitution of the union type with wrong types. (pythonGH-27218) bpo-44654: Refactor and clean up the union type implementation (pythonGH-27196) bpo-20291: Fix MSVC warnings in getargs.c (pythonGH-27211) ...
https://bugs.python.org/issue44654