Skip to content

[3.11] gh-115165: Fix typing.Annotated for immutable types (GH-115213) #115228

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 2 commits into from
Feb 9, 2024
Merged

[3.11] gh-115165: Fix typing.Annotated for immutable types (GH-115213) #115228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d81e8
gh-115165: Fix `typing.Annotated` for immutable types (GH-115213)
dave-shawley Feb 9, 2024
2c18de1
no pep-695 for you on Python 3.11
AlexWaygood Feb 9, 2024
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
Next Next commit
gh-115165: Fix typing.Annotated for immutable types (GH-115213) 
The return value from an annotated callable can raise any exception from
__setattr__ for the `__orig_class__` property.
(cherry picked from commit 5643856)

Co-authored-by: dave-shawley <daveshawley@gmail.com>
  • Loading branch information
@dave-shawley @miss-islington
dave-shawley authored and miss-islington committed Feb 9, 2024
commit 04d81e8a75b8e7cf6a72338807f638c198c210a6
21 changes: 21 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 @@ -3665,6 +3665,16 @@ class C(B[int]):
c.bar = 'abc'
self.assertEqual(c.__dict__, {'bar': 'abc'})

def test_setattr_exceptions(self):
class Immutable[T]:
Comment thread
AlexWaygood marked this conversation as resolved.
Outdated
def __setattr__(self, key, value):
raise RuntimeError("immutable")

# gh-115165: This used to cause RuntimeError to be raised
# when we tried to set `__orig_class__` on the `Immutable` instance
# returned by the `Immutable[int]()` call
self.assertIsInstance(Immutable[int](), Immutable)

def test_subscripted_generics_as_proxies(self):
T = TypeVar('T')
class C(Generic[T]):
Expand Down Expand Up @@ -7397,6 +7407,17 @@ def test_instantiate_generic(self):
self.assertEqual(MyCount([4, 4, 5]), {4: 2, 5: 1})
self.assertEqual(MyCount[int]([4, 4, 5]), {4: 2, 5: 1})

def test_instantiate_immutable(self):
class C:
def __setattr__(self, key, value):
raise Exception("should be ignored")

A = Annotated[C, "a decoration"]
# gh-115165: This used to cause RuntimeError to be raised
# when we tried to set `__orig_class__` on the `C` instance
# returned by the `A()` call
self.assertIsInstance(A(), C)

def test_cannot_instantiate_forward(self):
A = Annotated["int", (5, 6)]
with self.assertRaises(TypeError):
Expand Down
4 changes: 3 additions & 1 deletion Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,9 @@ def __call__(self, *args, **kwargs):
result = self.__origin__(*args, **kwargs)
try:
result.__orig_class__ = self
except AttributeError:
# Some objects raise TypeError (or something even more exotic)
# if you try to set attributes on them; we guard against that here
except Exception:
pass
return result

Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2024-02-09-07-20-16.gh-issue-115165.yfJLXA.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Most exceptions are now ignored when attempting to set the ``__orig_class__``
attribute on objects returned when calling :mod:`typing` generic aliases
(including generic aliases created using :data:`typing.Annotated`).
Previously only :exc:`AttributeError`` was ignored. Patch by Dave Shawley.