Skip to content
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.

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

[3.13] Add some more edge-case tests for inspect.get_annotations with eval_str=True (GH-120550) #120551

Merged
merged 1 commit into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions Lib/test/test_inspect/inspect_stringized_annotations_pep695.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ def generic_method[Foo, **Bar](
def generic_method_2[Eggs, **Spam](self, x: Eggs, y: Spam): pass


# Eggs is `int` in globals, a TypeVar in type_params, and `str` in locals:
class E[Eggs]:
Eggs = str
x: Eggs



def nested():
from types import SimpleNamespace
from inspect import get_annotations
Expand All @@ -53,7 +60,7 @@ def nested():
Spam = memoryview


class E[Eggs, **Spam]:
class F[Eggs, **Spam]:
x: Eggs
y: Spam

Expand All @@ -63,10 +70,18 @@ def generic_method[Eggs, **Spam](self, x: Eggs, y: Spam): pass
def generic_function[Eggs, **Spam](x: Eggs, y: Spam): pass


# Eggs is `int` in globals, `bytes` in the function scope,
# a TypeVar in the type_params, and `str` in locals:
class G[Eggs]:
Eggs = str
x: Eggs


return SimpleNamespace(
E=E,
E_annotations=get_annotations(E, eval_str=True),
E_meth_annotations=get_annotations(E.generic_method, eval_str=True),
F=F,
F_annotations=get_annotations(F, eval_str=True),
F_meth_annotations=get_annotations(F.generic_method, eval_str=True),
G_annotations=get_annotations(G, eval_str=True),
generic_func=generic_function,
generic_func_annotations=get_annotations(generic_function, eval_str=True)
)
24 changes: 17 additions & 7 deletions Lib/test/test_inspect/test_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -1770,26 +1770,36 @@ def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_v
)
)

def test_pep_695_generic_method_with_future_annotations_name_clash_with_global_and_local_vars(self):
self.assertEqual(
inspect.get_annotations(
inspect_stringized_annotations_pep695.E, eval_str=True
),
{"x": str},
)

def test_pep_695_generics_with_future_annotations_nested_in_function(self):
results = inspect_stringized_annotations_pep695.nested()

self.assertEqual(
set(results.E_annotations.values()),
set(results.E.__type_params__)
set(results.F_annotations.values()),
set(results.F.__type_params__)
)
self.assertEqual(
set(results.E_meth_annotations.values()),
set(results.E.generic_method.__type_params__)
set(results.F_meth_annotations.values()),
set(results.F.generic_method.__type_params__)
)
self.assertNotEqual(
set(results.E_meth_annotations.values()),
set(results.E.__type_params__)
set(results.F_meth_annotations.values()),
set(results.F.__type_params__)
)
self.assertEqual(
set(results.E_meth_annotations.values()).intersection(results.E.__type_params__),
set(results.F_meth_annotations.values()).intersection(results.F.__type_params__),
set()
)

self.assertEqual(results.G_annotations, {"x": str})

self.assertEqual(
set(results.generic_func_annotations.values()),
set(results.generic_func.__type_params__)
Expand Down
Loading