WIP

Author: sobolevn

Lib/dataclasses.py

@@ -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.

Lib/test/test_dataclasses/__init__.py

@@ -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
@@ -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),