gh-82129: Fix `NameError` on `get_type_hints` in `dataclasses` by sobolevn · Pull Request #122232 · python/cpython · GitHub
Skip to content

gh-82129: Fix NameError on get_type_hints in dataclasses #122232

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

Closed
sobolevn wants to merge 3 commits into from
+29 −6
Closed

gh-82129: Fix NameError on get_type_hints in dataclasses #122232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a96efef
gh-82129: Fix `NameError` on `get_type_hints` in `dataclasses`
sobolevn Jul 24, 2024
0d10812
gh-82129: Fix `NameError` on `get_type_hints` in `dataclasses`
sobolevn Jul 24, 2024
7af17e3
Address review
sobolevn Jul 24, 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
6 changes: 5 additions & 1 deletion Lib/dataclasses.py
View file
Open in desktop
26 changes: 21 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 weakref
import traceback
import unittest
import sys
from unittest.mock import Mock
from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar, Optional, Protocol, DefaultDict
from typing import get_type_hints
Expand All @@ -23,6 +24,7 @@
import dataclasses # Needed for the string "dataclasses.InitVar[int]" to work as an annotation.

from test import support
from test.support import import_helper

# Just any custom exception we can catch.
class CustomError(Exception): pass
Expand Down Expand Up @@ -4108,16 +4110,30 @@ def test_no_types(self):
C = make_dataclass('Point', ['x', 'y', 'z'])
c = C(1, 2, 3)
self.assertEqual(vars(c), {'x': 1, 'y': 2, 'z': 3})
self.assertEqual(C.__annotations__, {'x': 'typing.Any',
'y': 'typing.Any',
'z': 'typing.Any'})
self.assertEqual(C.__annotations__, {'x': typing.Any,
'y': typing.Any,
'z': typing.Any})

C = make_dataclass('Point', ['x', ('y', int), 'z'])
c = C(1, 2, 3)
self.assertEqual(vars(c), {'x': 1, 'y': 2, 'z': 3})
self.assertEqual(C.__annotations__, {'x': 'typing.Any',
self.assertEqual(C.__annotations__, {'x': typing.Any,
'y': int,
'z': 'typing.Any'})
'z': typing.Any})

def test_no_types_no_NameError(self):
C = make_dataclass('Point', ['x'])
self.assertEqual(C.__annotations__, {'x': typing.Any})
self.assertEqual(get_type_hints(C), {'x': typing.Any})

def test_no_types_no_NameError_no_typing_fallback(self):
with import_helper.isolated_modules():
del sys.modules['typing']
C = make_dataclass('Point', ['x'])
self.assertEqual(C.__annotations__,
{'x': "__import__('typing').Any"})
from typing import Any # since we hack our modules
self.assertEqual(get_type_hints(C), {'x': Any})

def test_module_attr(self):
self.assertEqual(ByMakeDataClass.__module__, __name__)
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2024-07-24-15-47-11.gh-issue-82129.7z5g8K.rst
View file
Open in desktop