X Tutup
Skip to content

gh-82129: Improve annotations for make_dataclass() #133406

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
JelleZijlstra merged 14 commits into from
May 5, 2025
Merged

gh-82129: Improve annotations for make_dataclass() #133406

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c2d85b7
gh-82128: Provide `__annotate__` method for dataclasses from `make_da…
sobolevn Jul 25, 2024
de409ad
Merge branch 'main' into issue-82129-2
sobolevn Sep 17, 2024
642f849
Fix NameError
sobolevn Sep 18, 2024
69251ac
Merge branch 'main' into issue-82129-2
sobolevn Sep 20, 2024
5ec3a08
Address review
sobolevn Sep 20, 2024
43caa3f
Update Misc/NEWS.d/next/Library/2024-09-18-09-15-40.gh-issue-82129.GQ…
sobolevn Sep 24, 2024
33b279d
Introduce `_ANY_MARKER`
sobolevn Sep 25, 2024
d5ddb16
Merge branch 'main' into issue-82129-2
sobolevn Oct 15, 2024
3b26e36
WIP
sobolevn Oct 15, 2024
2c4d618
Merge branch 'main' into issue-82129-2
JelleZijlstra May 4, 2025
309da4c
alt
JelleZijlstra May 4, 2025
3d7eb6e
better
JelleZijlstra May 4, 2025
9565089
comment
JelleZijlstra May 4, 2025
c013e7b
Merge remote-tracking branch 'upstream/main' into gh18219-alt
JelleZijlstra May 4, 2025
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
WIP
  • Loading branch information
@sobolevn
sobolevn committed Oct 15, 2024
commit 3b26e36e55f85a73866fa0ae04cb190ea6be01de
6 changes: 3 additions & 3 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,13 +1620,13 @@ def annotate_method(format):
for ann, t in annotations.items()
}

from typing import Any, _convert_to_source
from typing import Any
ann_dict = {
ann: Any if t is _ANY_MARKER else t
for ann, t in annotations.items()
}
if format == annotationlib.Format.SOURCE:
return _convert_to_source(ann_dict)
if format == annotationlib.Format.STRING:
return annotationlib.annotations_to_string(ann_dict)
return ann_dict

# Update 'ns' with the user-supplied namespace plus our calculated values.
Expand Down
11 changes: 6 additions & 5 deletions Lib/test/test_dataclasses/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import types
import weakref
import traceback
import sys
import unittest
from unittest.mock import Mock
from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar, Optional, Protocol, DefaultDict
Expand Down Expand Up @@ -4247,16 +4248,16 @@ def test_no_types_get_annotations(self):
)
self.assertEqual(
annotationlib.get_annotations(
C, format=annotationlib.Format.SOURCE),
C, format=annotationlib.Format.STRING),
{'x': 'typing.Any', 'y': 'int', 'z': 'typing.Any'},
)

def test_no_types_no_typing_import(self):
import sys

C = make_dataclass('C', ['x', ('y', int)])

with import_helper.CleanImport('typing'):
self.assertNotIn('typing', sys.modules)
C = make_dataclass('C', ['x', ('y', int)])

self.assertNotIn('typing', sys.modules)
self.assertEqual(
annotationlib.get_annotations(
C, format=annotationlib.Format.FORWARDREF),
Expand Down
X Tutup