bpo-45755: [typing] Reveal class attributes of generic in generic aliases in `dir()` (GH-29962)
(cherry picked from commit d6e13747161d7b634b47d2d3d212ed3be4a21fab)
Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index fdec29e..82b6f8c 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4994,6 +4994,17 @@ def test_special_attrs2(self):
loaded = pickle.loads(s)
self.assertIs(SpecialAttrsP, loaded)
+ def test_genericalias_dir(self):
+ class Foo(Generic[T]):
+ def bar(self):
+ pass
+ baz = 3
+ # The class attributes of the original class should be visible even
+ # in dir() of the GenericAlias. See bpo-45755.
+ self.assertIn('bar', dir(Foo[int]))
+ self.assertIn('baz', dir(Foo[int]))
+
+
class AllTests(BaseTestCase):
"""Tests for __all__."""
diff --git a/Lib/typing.py b/Lib/typing.py
index b743d40..2522547 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -983,6 +983,9 @@ def __subclasscheck__(self, cls):
raise TypeError("Subscripted generics cannot be used with"
" class and instance checks")
+ def __dir__(self):
+ return list(set(super().__dir__()
+ + [attr for attr in dir(self.__origin__) if not _is_dunder(attr)]))
# Special typing constructs Union, Optional, Generic, Callable and Tuple
# use three special attributes for internal bookkeeping of generic types: