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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
More tests
  • Loading branch information
@adriangb
adriangb committed Apr 23, 2023
commit 631d428317988c74f1a0277cde0392a19698aa56
39 changes: 9 additions & 30 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6698,42 +6698,18 @@ def test_copy_and_pickle(self):
def test_orig_bases(self):
T = TypeVar('T')

class Parent(NamedTuple):
class SimpleNamedTuple(NamedTuple):
pass

class Child(Parent):
pass

class OtherChild(Parent):
pass

class MixedChild(Child, OtherChild, Parent):
class GenericNamedTuple(NamedTuple, Generic[T]):
pass

class GenericParent(NamedTuple, Generic[T]):
pass
self.assertEqual(SimpleNamedTuple.__orig_bases__, (NamedTuple,))
self.assertEqual(GenericNamedTuple.__orig_bases__, (NamedTuple, Generic[T]))

class GenericChild(GenericParent[int]):
pass
CallNamedTuple = NamedTuple('CallNamedTuple', [])

class OtherGenericChild(GenericParent[str]):
pass

class MixedGenericChild(GenericChild, OtherGenericChild, GenericParent[float]):
pass

class MultipleGenericBases(GenericParent[int], GenericParent[float]):
pass

self.assertEqual(Parent.__orig_bases__, (NamedTuple,))
self.assertEqual(Child.__orig_bases__, (Parent,))
self.assertEqual(OtherChild.__orig_bases__, (Parent,))
self.assertEqual(MixedChild.__orig_bases__, (Child, OtherChild, Parent,))
self.assertEqual(GenericParent.__orig_bases__, (NamedTuple, Generic[T]))
self.assertEqual(GenericChild.__orig_bases__, (GenericParent[int],))
self.assertEqual(OtherGenericChild.__orig_bases__, (GenericParent[str],))
self.assertEqual(MixedGenericChild.__orig_bases__, (GenericChild, OtherGenericChild, GenericParent[float]))
self.assertEqual(MultipleGenericBases.__orig_bases__, (GenericParent[int], GenericParent[float]))
self.assertEqual(CallNamedTuple.__orig_bases__, (NamedTuple,))


class TypedDictTests(BaseTestCase):
Expand Down Expand Up @@ -7196,6 +7172,8 @@ class MixedGenericChild(GenericChild, OtherGenericChild, GenericParent[float]):
class MultipleGenericBases(GenericParent[int], GenericParent[float]):
pass

CallTypedDict = TypedDict('CallTypedDict', {})

self.assertEqual(Parent.__orig_bases__, (TypedDict,))
self.assertEqual(Child.__orig_bases__, (Parent,))
self.assertEqual(OtherChild.__orig_bases__, (Parent,))
Expand All @@ -7205,6 +7183,7 @@ class MultipleGenericBases(GenericParent[int], GenericParent[float]):
self.assertEqual(OtherGenericChild.__orig_bases__, (GenericParent[str],))
self.assertEqual(MixedGenericChild.__orig_bases__, (GenericChild, OtherGenericChild, GenericParent[float]))
self.assertEqual(MultipleGenericBases.__orig_bases__, (GenericParent[int], GenericParent[float]))
self.assertEqual(CallTypedDict.__orig_bases__, (TypedDict,))


class RequiredTests(BaseTestCase):
Expand Down