mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Allow decorators and return annotations to be used together (fixes SF#1697248)

Browse source
This commit is contained in:
Nick Coghlan 2007-04-23 11:05:01 +00:00
parent 4138bfec0a
commit 71011e2c2b
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_grammar.py
View file

@ -322,7 +322,12 @@ class GrammarTests(unittest.TestCase):
self.assertEquals(f.__annotations__, self.assertEquals(f.__annotations__,
{'b': 1, 'c': 2, 'e': 3, 'g': 6, 'h': 7, 'j': 9, {'b': 1, 'c': 2, 'e': 3, 'g': 6, 'h': 7, 'j': 9,
'k': 11, 'return': 12}) 'k': 11, 'return': 12})
# Check for SF Bug #1697248 - mixing decorators and a return annotation
def null(x): return x
@null
def f(x) -> list: pass
self.assertEquals(f.__annotations__, {'return': list})
# test MAKE_CLOSURE with a variety of oparg's # test MAKE_CLOSURE with a variety of oparg's
closure = 1 closure = 1
def f(): return closure def f(): return closure

2
Python/ast.c
View file

@ -983,7 +983,7 @@ ast_for_funcdef(struct compiling *c, const node *n)
REQ(n, funcdef); REQ(n, funcdef);
if (NCH(n) == 6) { /* decorators are present */ if (NCH(n) == 6 || NCH(n) == 8) { /* decorators are present */
decorator_seq = ast_for_decorators(c, CHILD(n, 0)); decorator_seq = ast_for_decorators(c, CHILD(n, 0));
if (!decorator_seq) if (!decorator_seq)
return NULL; return NULL;