diff options
author | Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> | 2021-12-16 22:29:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-16 22:29:59 +0800 |
commit | d6e13747161d7b634b47d2d3d212ed3be4a21fab (patch) | |
tree | 9882b6f1113e19290e8608030310c446546bca11 | |
parent | 4506bbede1644e985991884964b43afa7ee6f609 (diff) | |
download | cpython-git-d6e13747161d7b634b47d2d3d212ed3be4a21fab.tar.gz |
bpo-45755: [typing] Reveal class attributes of generic in generic aliases in `dir()` (GH-29962)
-rw-r--r-- | Lib/test/test_typing.py | 11 | ||||
-rw-r--r-- | Lib/typing.py | 3 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2021-12-07-21-55-22.bpo-45755.bRqKGa.rst | 3 |
3 files changed, 17 insertions, 0 deletions
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 90d6bea59f..a94d77d4ed 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -5040,6 +5040,17 @@ class SpecialAttrsTests(BaseTestCase): 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 bdd19cadb4..ae1dd5c2d7 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -991,6 +991,9 @@ class _BaseGenericAlias(_Final, _root=True): 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: diff --git a/Misc/NEWS.d/next/Library/2021-12-07-21-55-22.bpo-45755.bRqKGa.rst b/Misc/NEWS.d/next/Library/2021-12-07-21-55-22.bpo-45755.bRqKGa.rst new file mode 100644 index 0000000000..e5201b0dfd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-07-21-55-22.bpo-45755.bRqKGa.rst @@ -0,0 +1,3 @@ +:mod:`typing` generic aliases now reveal the class attributes of the +original generic class when passed to ``dir()``. This was the behavior up to +Python 3.6, but was changed in 3.7-3.9. |