bpo-44606: Fix __instancecheck__ and __subclasscheck__ for the union type.#27120
Merged
serhiy-storchaka merged 2 commits intoJul 14, 2021
python:mainpython/cpython:mainfrom
serhiy-storchaka:union-instancecheckserhiy-storchaka/cpython:union-instancecheckCopy head branch name to clipboard
Merged
bpo-44606: Fix __instancecheck__ and __subclasscheck__ for the union type.#27120serhiy-storchaka merged 2 commits intopython:mainpython/cpython:mainfrom serhiy-storchaka:union-instancecheckserhiy-storchaka/cpython:union-instancecheckCopy head branch name to clipboard
serhiy-storchaka merged 2 commits into
python:mainpython/cpython:mainfrom
serhiy-storchaka:union-instancecheckserhiy-storchaka/cpython:union-instancecheckCopy head branch name to clipboard
Conversation
…type. * Fix issubclass() for None. E.g. issubclass(type(None), int | None) returns now True. * Fix issubclass() for virtual subclasses. E.g. issubclass(dict, int | collections.abc.Mapping) returns now True. * Fix crash in isinstance() if the check for one of items raises exception.
Member
|
We don't need to backport to 3.9, because union is 3.10 only. |
Fidget-Spinner
approved these changes
Jul 13, 2021
Fidget-Spinner
left a comment
Member
There was a problem hiding this comment.
LGTM. Once again, thanks for fixing this nasty crash!
| x = int | BadMeta('A', (), {}) | ||
| self.assertTrue(issubclass(int, x)) | ||
| self.assertRaises(ZeroDivisionError, issubclass, list, x) | ||
|
|
Member
There was a problem hiding this comment.
Maybe you can add your test from the bpo for virtual subclasses issubclass(dict, int | collections.abc.Mapping)?
Then again we may not need that test. If the previous tests throw the ZeroDivisionError, then that means it's already looking into the __subclasscheck__ dunder.
Member
Author
There was a problem hiding this comment.
Oh, I forget about this. Thank you for reminder.
| PyObject *arg = PyTuple_GET_ITEM(alias->args, iarg); | ||
| if (PyType_Check(arg) && (PyType_IsSubtype((PyTypeObject *)instance, (PyTypeObject *)arg) != 0)) { | ||
| Py_RETURN_TRUE; | ||
| if (arg == Py_None) { |
Member
There was a problem hiding this comment.
Reminder for myself that this can probably be removed when we do the auto conversion of None to type(None).
Contributor
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10. |
|
GH-27132 is a backport of this pull request to the 3.10 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 14, 2021
…type. (pythonGH-27120) * Fix issubclass() for None. E.g. issubclass(type(None), int | None) returns now True. * Fix issubclass() for virtual subclasses. E.g. issubclass(dict, int | collections.abc.Mapping) returns now True. * Fix crash in isinstance() if the check for one of items raises exception. (cherry picked from commit 8198905) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
miss-islington
added a commit
that referenced
this pull request
Jul 14, 2021
…type. (GH-27120) * Fix issubclass() for None. E.g. issubclass(type(None), int | None) returns now True. * Fix issubclass() for virtual subclasses. E.g. issubclass(dict, int | collections.abc.Mapping) returns now True. * Fix crash in isinstance() if the check for one of items raises exception. (cherry picked from commit 8198905) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
E.g. issubclass(type(None), int | None) returns now True.
E.g. issubclass(dict, int | collections.abc.Mapping) returns now True.
https://bugs.python.org/issue44606