Address review

Author: sobolevn

Lib/dataclasses.py

@@ -9,7 +9,6 @@
 import abc
 import _thread
 from types import FunctionType, GenericAlias
-from typing import ForwardRef
 
 
 __all__ = ['dataclass',
@@ -453,6 +452,7 @@ def _field_init(f, frozen, globals, self_name, slots, module):
     # initialize this field.
 
     if f.init and isinstance(f.type, str):
+        from typing import ForwardRef  # `typing` is a heavy import
         # We need to resolve this string type into a real `ForwardRef` object,
         # because otherwise we might end up with unsolvable annotations.
         # For example:

Lib/test/dataclass_textanno2.py

@@ -18,7 +18,7 @@ class Foo:  # matching name with `dataclass_testanno.Foo`
 
 
 @dataclasses.dataclass
-class WithMatchinNameOverride(dataclass_textanno.Bar):
+class WithMatchingNameOverride(dataclass_textanno.Bar):
     foo: Foo  # Existing `foo` annotation should be overridden
 
 

Lib/test/test_dataclasses.py

@@ -3227,12 +3227,12 @@ def test_dataclass_proxy_modules_matching_name_override(self):
         from dataclasses import dataclass
 
         @dataclass
-        class Default(dataclass_textanno2.WithMatchinNameOverride):
+        class Default(dataclass_textanno2.WithMatchingNameOverride):
             pass
 
         classes = [
             Default,
-            dataclass_textanno2.WithMatchinNameOverride
+            dataclass_textanno2.WithMatchingNameOverride
         ]
         for klass in classes:
             with self.subTest(klass=klass):