mirror of
https://github.com/python/cpython.git
synced 2025-10-21 22:22:48 +00:00
gh-119180: annotationlib: Fix __all__, formatting (#122365)
This commit is contained in:
parent
016f4b5975
commit
4534068f22
3 changed files with 68 additions and 33 deletions
|
@ -8,6 +8,7 @@ import unittest
|
|||
from annotationlib import Format, ForwardRef, get_annotations, get_annotate_function
|
||||
from typing import Unpack
|
||||
|
||||
from test import support
|
||||
from test.test_inspect import inspect_stock_annotations
|
||||
from test.test_inspect import inspect_stringized_annotations
|
||||
from test.test_inspect import inspect_stringized_annotations_2
|
||||
|
@ -327,7 +328,9 @@ class TestGetAnnotations(unittest.TestCase):
|
|||
)
|
||||
self.assertEqual(annotationlib.get_annotations(NoDict), {"b": str})
|
||||
self.assertEqual(
|
||||
annotationlib.get_annotations(NoDict, format=annotationlib.Format.FORWARDREF),
|
||||
annotationlib.get_annotations(
|
||||
NoDict, format=annotationlib.Format.FORWARDREF
|
||||
),
|
||||
{"b": str},
|
||||
)
|
||||
self.assertEqual(
|
||||
|
@ -715,12 +718,13 @@ class TestGetAnnotations(unittest.TestCase):
|
|||
)
|
||||
self.assertEqual(B_annotations, {"x": int, "y": str, "z": bytes})
|
||||
|
||||
def test_pep695_generic_class_with_future_annotations_name_clash_with_global_vars(self):
|
||||
def test_pep695_generic_class_with_future_annotations_name_clash_with_global_vars(
|
||||
self,
|
||||
):
|
||||
ann_module695 = inspect_stringized_annotations_pep695
|
||||
C_annotations = annotationlib.get_annotations(ann_module695.C, eval_str=True)
|
||||
self.assertEqual(
|
||||
set(C_annotations.values()),
|
||||
set(ann_module695.C.__type_params__)
|
||||
set(C_annotations.values()), set(ann_module695.C.__type_params__)
|
||||
)
|
||||
|
||||
def test_pep_695_generic_function_with_future_annotations(self):
|
||||
|
@ -737,17 +741,19 @@ class TestGetAnnotations(unittest.TestCase):
|
|||
self.assertIs(generic_func_annotations["z"].__origin__, func_t_params[2])
|
||||
self.assertIs(generic_func_annotations["zz"].__origin__, func_t_params[2])
|
||||
|
||||
def test_pep_695_generic_function_with_future_annotations_name_clash_with_global_vars(self):
|
||||
def test_pep_695_generic_function_with_future_annotations_name_clash_with_global_vars(
|
||||
self,
|
||||
):
|
||||
self.assertEqual(
|
||||
set(
|
||||
annotationlib.get_annotations(
|
||||
inspect_stringized_annotations_pep695.generic_function_2,
|
||||
eval_str=True
|
||||
eval_str=True,
|
||||
).values()
|
||||
),
|
||||
set(
|
||||
inspect_stringized_annotations_pep695.generic_function_2.__type_params__
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
def test_pep_695_generic_method_with_future_annotations(self):
|
||||
|
@ -761,23 +767,27 @@ class TestGetAnnotations(unittest.TestCase):
|
|||
}
|
||||
self.assertEqual(
|
||||
generic_method_annotations,
|
||||
{"x": params["Foo"], "y": params["Bar"], "return": None}
|
||||
{"x": params["Foo"], "y": params["Bar"], "return": None},
|
||||
)
|
||||
|
||||
def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_vars(self):
|
||||
def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_vars(
|
||||
self,
|
||||
):
|
||||
self.assertEqual(
|
||||
set(
|
||||
annotationlib.get_annotations(
|
||||
inspect_stringized_annotations_pep695.D.generic_method_2,
|
||||
eval_str=True
|
||||
eval_str=True,
|
||||
).values()
|
||||
),
|
||||
set(
|
||||
inspect_stringized_annotations_pep695.D.generic_method_2.__type_params__
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_and_local_vars(self):
|
||||
def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_and_local_vars(
|
||||
self,
|
||||
):
|
||||
self.assertEqual(
|
||||
annotationlib.get_annotations(
|
||||
inspect_stringized_annotations_pep695.E, eval_str=True
|
||||
|
@ -789,20 +799,20 @@ class TestGetAnnotations(unittest.TestCase):
|
|||
results = inspect_stringized_annotations_pep695.nested()
|
||||
|
||||
self.assertEqual(
|
||||
set(results.F_annotations.values()),
|
||||
set(results.F.__type_params__)
|
||||
set(results.F_annotations.values()), set(results.F.__type_params__)
|
||||
)
|
||||
self.assertEqual(
|
||||
set(results.F_meth_annotations.values()),
|
||||
set(results.F.generic_method.__type_params__)
|
||||
set(results.F.generic_method.__type_params__),
|
||||
)
|
||||
self.assertNotEqual(
|
||||
set(results.F_meth_annotations.values()),
|
||||
set(results.F.__type_params__)
|
||||
set(results.F_meth_annotations.values()), set(results.F.__type_params__)
|
||||
)
|
||||
self.assertEqual(
|
||||
set(results.F_meth_annotations.values()).intersection(results.F.__type_params__),
|
||||
set()
|
||||
set(results.F_meth_annotations.values()).intersection(
|
||||
results.F.__type_params__
|
||||
),
|
||||
set(),
|
||||
)
|
||||
|
||||
self.assertEqual(results.G_annotations, {"x": str})
|
||||
|
@ -823,7 +833,9 @@ class TestCallEvaluateFunction(unittest.TestCase):
|
|||
with self.assertRaises(NameError):
|
||||
annotationlib.call_evaluate_function(evaluate, annotationlib.Format.VALUE)
|
||||
self.assertEqual(
|
||||
annotationlib.call_evaluate_function(evaluate, annotationlib.Format.FORWARDREF),
|
||||
annotationlib.call_evaluate_function(
|
||||
evaluate, annotationlib.Format.FORWARDREF
|
||||
),
|
||||
annotationlib.ForwardRef("undefined"),
|
||||
)
|
||||
self.assertEqual(
|
||||
|
@ -853,12 +865,14 @@ class MetaclassTests(unittest.TestCase):
|
|||
self.assertEqual(get_annotate_function(Y)(Format.VALUE), {"b": float})
|
||||
|
||||
def test_unannotated_meta(self):
|
||||
class Meta(type): pass
|
||||
class Meta(type):
|
||||
pass
|
||||
|
||||
class X(metaclass=Meta):
|
||||
a: str
|
||||
|
||||
class Y(X): pass
|
||||
class Y(X):
|
||||
pass
|
||||
|
||||
self.assertEqual(get_annotations(Meta), {})
|
||||
self.assertIs(get_annotate_function(Meta), None)
|
||||
|
@ -907,6 +921,13 @@ class MetaclassTests(unittest.TestCase):
|
|||
self.assertEqual(get_annotations(c), c.expected_annotations)
|
||||
annotate_func = get_annotate_function(c)
|
||||
if c.expected_annotations:
|
||||
self.assertEqual(annotate_func(Format.VALUE), c.expected_annotations)
|
||||
self.assertEqual(
|
||||
annotate_func(Format.VALUE), c.expected_annotations
|
||||
)
|
||||
else:
|
||||
self.assertIs(annotate_func, None)
|
||||
|
||||
|
||||
class TestAnnotationLib(unittest.TestCase):
|
||||
def test__all__(self):
|
||||
support.check__all__(self, annotationlib)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue