Skip to content

gh-115165: Fix Annotated for immutable types #115213

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 6 commits into from
Feb 9, 2024
+28 −1
Merged

gh-115165: Fix Annotated for immutable types #115213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b87995b
gh-115165: Fix Annotated for immutable types
dave-shawley Feb 9, 2024
1d7e6e5
fixup! gh-115165: Fix Annotated for immutable types
dave-shawley Feb 9, 2024
ff5e885
fixup! gh-115165: Fix Annotated for immutable types
dave-shawley Feb 9, 2024
7289af4
fixup! gh-115165: Fix Annotated for immutable types
dave-shawley Feb 9, 2024
7fcb394
fixup! gh-115165: Fix Annotated for immutable types
dave-shawley Feb 9, 2024
702ba2c
Small tweaks
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 Annotated for immutable types 
The return value from an annotated callable can raise any exception from
__setattr__ for the `__orig_class__` property.
  • Loading branch information
@dave-shawley
dave-shawley committed Feb 9, 2024
commit b87995b94dd1ca6ff19963174fcbfcf6e7c15e94
10 changes: 10 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 @@ -8756,6 +8756,16 @@ class B(str): ...
self.assertIs(type(field_c2.__metadata__[0]), float)
self.assertIs(type(field_c3.__metadata__[0]), bool)

def test_annotated_callable_returning_immutable(self):
class C:
def __setattr__(self, name, value):
raise Exception('should be ignored')

class A(str): ...

annotated = Annotated[C, A("A")]
self.assertIsInstance(annotated(), C)

Comment thread
AlexWaygood marked this conversation as resolved.
Outdated

class TypeAliasTests(BaseTestCase):
def test_canonical_usage_with_variable_annotation(self):
Expand Down
2 changes: 1 addition & 1 deletion Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ def __call__(self, *args, **kwargs):
result = self.__origin__(*args, **kwargs)
try:
result.__orig_class__ = self
except AttributeError:
except Exception:
Comment thread
AlexWaygood marked this conversation as resolved.
pass
return result

Expand Down
3 changes: 3 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,3 @@
``typing.Annotated`` ignores exceptions when setting the ``__orig_class__``
Comment thread
AlexWaygood marked this conversation as resolved.
Outdated
attribute on objects returned from a callable. Previously only ``TypeError``
was ignored.
Comment thread
AlexWaygood marked this conversation as resolved.
Outdated