Skip to content

GH-103699: Add __orig_bases__ to various typing classes #103698

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

Merged
AlexWaygood merged 11 commits into from
Apr 23, 2023
Merged

GH-103699: Add __orig_bases__ to various typing classes #103698

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a81c98
Add `__orig_bases__` to non-generic TypedDict
adriangb Apr 22, 2023
270cadf
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 22, 2023
29b643d
Use double backticks
adriangb Apr 22, 2023
4037df1
remove whitespace
AlexWaygood Apr 22, 2023
19569f9
add more test cases
adriangb Apr 23, 2023
b777373
one more test
adriangb Apr 23, 2023
4c9ee8c
Make call-based NamedTuples behave like call-based TypedDicts
adriangb Apr 23, 2023
7224ddd
Add (failing) tests
adriangb Apr 23, 2023
631d428
More tests
adriangb Apr 23, 2023
58701ac
Update Misc/NEWS.d/next/Library/2023-04-22-22-37-39.gh-issue-103699.N…
adriangb Apr 23, 2023
3fe75eb
Update Misc/NEWS.d/next/Library/2023-04-22-22-37-39.gh-issue-103699.N…
adriangb Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7126,6 +7126,9 @@ class TD(TypedDict):
self.assertIs(type(a), dict)
self.assertEqual(a, {'a': 1})

def test_orig_bases(self):
self.assertEqual(ChildTotalMovie.__orig_bases__, (ParentNontotalMovie,))
Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra Apr 23, 2023

Choose a reason for hiding this comment

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

Could you add some more tests? Suggestions: a TypedDict with no bases, one with multiple bases, a generic TypedDict.

Copy link
Copy Markdown
Member

@AlexWaygood AlexWaygood Apr 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

__orig_bases__ on generic TypedDicts are already tested quite extensively, e.g.

cpython/Lib/test/test_typing.py

Line 7017 in 4037df1

self.assertEqual(A.__orig_bases__, (TypedDict, Generic[T]))

Tests for TypedDicts with no bases and multiple bases sound worth adding, though

Copy link
Copy Markdown
Contributor Author

@adriangb adriangb Apr 23, 2023

Choose a reason for hiding this comment

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

I added quite a few :)

Copy link
Copy Markdown
Contributor Author

@adriangb adriangb Apr 23, 2023

Choose a reason for hiding this comment

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

Should I remove the checks on generic TypedDicts then? Or move them all here?

Copy link
Copy Markdown
Member

@AlexWaygood AlexWaygood Apr 23, 2023

Choose a reason for hiding this comment

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

Should I remove the checks on generic TypedDicts then? Or move them all here?

I think it's probably fine as is, actually. A little bit of duplication in tests isn't a massive issue, and it makes sense to both:

1). Test __orig_bases__ in the test method for testing generic TypedDicts
2). Test generic TypedDicts in the test method for testing __orig_bases__



class RequiredTests(BaseTestCase):

Expand Down
3 changes: 3 additions & 0 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2994,6 +2994,9 @@ def __new__(cls, name, bases, ns, total=True):

tp_dict = type.__new__(_TypedDictMeta, name, (*generic_base, dict), ns)

if not hasattr(tp_dict, '__orig_bases__'):
tp_dict.__orig_bases__ = bases

annotations = {}
own_annotations = ns.get('__annotations__', {})
msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-04-22-22-37-39.gh-issue-103699.NizCjc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``__orig_bases__`` to non-generic TypedDicts
Comment thread
adriangb marked this conversation as resolved.
Outdated