Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f315c1c0
Commit
f315c1c0
authored
Jul 23, 2015
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #24687: Plug refleak on SyntaxError in function parameters annotations.
parent
2f07a66d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
15 deletions
+22
-15
Lib/test/test_coroutines.py
Lib/test/test_coroutines.py
+4
-0
Lib/test/test_grammar.py
Lib/test/test_grammar.py
+2
-1
Misc/NEWS
Misc/NEWS
+3
-0
Python/compile.c
Python/compile.c
+13
-14
No files found.
Lib/test/test_coroutines.py
View file @
f315c1c0
...
...
@@ -211,6 +211,10 @@ class AsyncBadSyntaxTest(unittest.TestCase):
pass
"""
,
"""async def foo(a:await b):
pass
"""
,
"""def baz():
async def foo(a=await b):
pass
...
...
Lib/test/test_grammar.py
View file @
f315c1c0
...
...
@@ -534,7 +534,8 @@ class GrammarTests(unittest.TestCase):
# Not allowed at class scope
check_syntax_error
(
self
,
"class foo:yield 1"
)
check_syntax_error
(
self
,
"class foo:yield from ()"
)
# Check annotation refleak on SyntaxError
check_syntax_error
(
self
,
"def g(a:(yield)): pass"
)
def
test_raise
(
self
):
# 'raise' test [',' test]
...
...
Misc/NEWS
View file @
f315c1c0
...
...
@@ -22,6 +22,9 @@ Core and Builtins
- Issue #24619: New approach for tokenizing async/await. As a consequence,
is is now possible to have one-line '
async
def
foo
():
await
..
' functions.
- Issue #24687: Plug refleak on SyntaxError in function parameters
annotations.
Library
-------
...
...
Python/compile.c
View file @
f315c1c0
...
...
@@ -1559,32 +1559,31 @@ compiler_visit_argannotation(struct compiler *c, identifier id,
VISIT
(
c
,
expr
,
annotation
);
mangled
=
_Py_Mangle
(
c
->
u
->
u_private
,
id
);
if
(
!
mangled
)
return
-
1
;
return
0
;
if
(
PyList_Append
(
names
,
mangled
)
<
0
)
{
Py_DECREF
(
mangled
);
return
-
1
;
return
0
;
}
Py_DECREF
(
mangled
);
}
return
0
;
return
1
;
}
static
int
compiler_visit_argannotations
(
struct
compiler
*
c
,
asdl_seq
*
args
,
PyObject
*
names
)
{
int
i
,
error
;
int
i
;
for
(
i
=
0
;
i
<
asdl_seq_LEN
(
args
);
i
++
)
{
arg_ty
arg
=
(
arg_ty
)
asdl_seq_GET
(
args
,
i
);
error
=
compiler_visit_argannotation
(
if
(
!
compiler_visit_argannotation
(
c
,
arg
->
arg
,
arg
->
annotation
,
names
);
if
(
error
)
return
error
;
names
))
return
0
;
}
return
0
;
return
1
;
}
static
int
...
...
@@ -1604,16 +1603,16 @@ compiler_visit_annotations(struct compiler *c, arguments_ty args,
if
(
!
names
)
return
-
1
;
if
(
compiler_visit_argannotations
(
c
,
args
->
args
,
names
))
if
(
!
compiler_visit_argannotations
(
c
,
args
->
args
,
names
))
goto
error
;
if
(
args
->
vararg
&&
args
->
vararg
->
annotation
&&
compiler_visit_argannotation
(
c
,
args
->
vararg
->
arg
,
!
compiler_visit_argannotation
(
c
,
args
->
vararg
->
arg
,
args
->
vararg
->
annotation
,
names
))
goto
error
;
if
(
compiler_visit_argannotations
(
c
,
args
->
kwonlyargs
,
names
))
if
(
!
compiler_visit_argannotations
(
c
,
args
->
kwonlyargs
,
names
))
goto
error
;
if
(
args
->
kwarg
&&
args
->
kwarg
->
annotation
&&
compiler_visit_argannotation
(
c
,
args
->
kwarg
->
arg
,
!
compiler_visit_argannotation
(
c
,
args
->
kwarg
->
arg
,
args
->
kwarg
->
annotation
,
names
))
goto
error
;
...
...
@@ -1622,7 +1621,7 @@ compiler_visit_annotations(struct compiler *c, arguments_ty args,
if
(
!
return_str
)
goto
error
;
}
if
(
compiler_visit_argannotation
(
c
,
return_str
,
returns
,
names
))
{
if
(
!
compiler_visit_argannotation
(
c
,
return_str
,
returns
,
names
))
{
goto
error
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment