Skip to content

gh-105164: Detect annotations inside match blocks #105177

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

Merged
JelleZijlstra merged 2 commits into from
Jun 5, 2023
Merged

gh-105164: Detect annotations inside match blocks #105177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ed5ce
gh-105164: Detect annotations inside match blocks
JelleZijlstra Jun 1, 2023
4d09ac4
more tests
JelleZijlstra Jun 1, 2023
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
Next Next commit
gh-105164: Detect annotations inside match blocks
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Jun 1, 2023
commit f7ed5ce0244eae4e0b1887e4cbaff4960edb0fca
15 changes: 15 additions & 0 deletions Lib/test/test_type_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import unittest
from test.support import run_code

class TypeAnnotationTests(unittest.TestCase):

Expand Down Expand Up @@ -101,3 +102,17 @@ class D(metaclass=C):
with self.assertRaises(AttributeError):
del D.__annotations__
self.assertEqual(D.__annotations__, {})

def test_module_level(self):
ns = run_code("x: int = 1")
self.assertEqual(ns["__annotations__"], {"x": int})

ns = run_code("if True:\n x: int = 1")
self.assertEqual(ns["__annotations__"], {"x": int})

ns = run_code("""
match 0:
case 0:
x: int = 1
""")
self.assertEqual(ns["__annotations__"], {"x": int})
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-05-31-19-35-22.gh-issue-105164.6Wajph.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure annotations are set up correctly if the only annotation in a block is
within a :keyword:`match` block. Patch by Jelle Zijlstra.
10 changes: 10 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,8 +1422,18 @@ find_ann(asdl_stmt_seq *stmts)
find_ann(st->v.TryStar.finalbody) ||
find_ann(st->v.TryStar.orelse);
break;
case Match_kind:
for (j = 0; j < asdl_seq_LEN(st->v.Match.cases); j++) {
match_case_ty match_case = (match_case_ty)asdl_seq_GET(
st->v.Match.cases, j);
if (find_ann(match_case->body)) {
return true;
}
}
break;
default:
res = false;
break;
}
if (res) {
break;
Expand Down