mirror of https://github.com/python/cpython
compiler: don't emit SyntaxWarning on const stmt
Issue #26204: the compiler doesn't emit SyntaxWarning warnings anymore when constant statements are ignored.
This commit is contained in:
parent
896632ea6b
commit
15a3095d64
|
@ -3,7 +3,6 @@ import dis
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import unittest
|
import unittest
|
||||||
import warnings
|
|
||||||
import weakref
|
import weakref
|
||||||
|
|
||||||
from test import support
|
from test import support
|
||||||
|
@ -240,10 +239,8 @@ class AST_Tests(unittest.TestCase):
|
||||||
ast_tree = compile(i, "?", kind, ast.PyCF_ONLY_AST)
|
ast_tree = compile(i, "?", kind, ast.PyCF_ONLY_AST)
|
||||||
self.assertEqual(to_tuple(ast_tree), o)
|
self.assertEqual(to_tuple(ast_tree), o)
|
||||||
self._assertTrueorder(ast_tree, (0, 0))
|
self._assertTrueorder(ast_tree, (0, 0))
|
||||||
with warnings.catch_warnings():
|
with self.subTest(action="compiling", input=i, kind=kind):
|
||||||
warnings.filterwarnings('ignore', category=SyntaxWarning)
|
compile(ast_tree, "?", kind)
|
||||||
with self.subTest(action="compiling", input=i, kind=kind):
|
|
||||||
compile(ast_tree, "?", kind)
|
|
||||||
|
|
||||||
def test_slice(self):
|
def test_slice(self):
|
||||||
slc = ast.parse("x[::]").body[0].value.slice
|
slc = ast.parse("x[::]").body[0].value.slice
|
||||||
|
|
|
@ -66,6 +66,24 @@ nlocals: 1
|
||||||
flags: 67
|
flags: 67
|
||||||
consts: ('None',)
|
consts: ('None',)
|
||||||
|
|
||||||
|
>>> def optimize_away():
|
||||||
|
... 'doc string'
|
||||||
|
... 'not a docstring'
|
||||||
|
... 53
|
||||||
|
... 0x53
|
||||||
|
|
||||||
|
>>> dump(optimize_away.__code__)
|
||||||
|
name: optimize_away
|
||||||
|
argcount: 0
|
||||||
|
kwonlyargcount: 0
|
||||||
|
names: ()
|
||||||
|
varnames: ()
|
||||||
|
cellvars: ()
|
||||||
|
freevars: ()
|
||||||
|
nlocals: 0
|
||||||
|
flags: 67
|
||||||
|
consts: ("'doc string'", 'None')
|
||||||
|
|
||||||
>>> def keywordonly_args(a,b,*,k1):
|
>>> def keywordonly_args(a,b,*,k1):
|
||||||
... return a,b,k1
|
... return a,b,k1
|
||||||
...
|
...
|
||||||
|
@ -84,10 +102,8 @@ consts: ('None',)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import textwrap
|
|
||||||
import unittest
|
import unittest
|
||||||
import weakref
|
import weakref
|
||||||
import warnings
|
|
||||||
from test.support import run_doctest, run_unittest, cpython_only
|
from test.support import run_doctest, run_unittest, cpython_only
|
||||||
|
|
||||||
|
|
||||||
|
@ -118,44 +134,6 @@ class CodeTest(unittest.TestCase):
|
||||||
self.assertEqual(co.co_name, "funcname")
|
self.assertEqual(co.co_name, "funcname")
|
||||||
self.assertEqual(co.co_firstlineno, 15)
|
self.assertEqual(co.co_firstlineno, 15)
|
||||||
|
|
||||||
def dump(self, co):
|
|
||||||
dump = {}
|
|
||||||
for attr in ["name", "argcount", "kwonlyargcount", "names", "varnames",
|
|
||||||
"cellvars", "freevars", "nlocals", "flags"]:
|
|
||||||
dump[attr] = getattr(co, "co_" + attr)
|
|
||||||
dump['consts'] = tuple(consts(co.co_consts))
|
|
||||||
return dump
|
|
||||||
|
|
||||||
def test_optimize_away(self):
|
|
||||||
ns = {}
|
|
||||||
with warnings.catch_warnings():
|
|
||||||
warnings.filterwarnings('ignore', category=SyntaxWarning)
|
|
||||||
exec(textwrap.dedent('''
|
|
||||||
def optimize_away():
|
|
||||||
'doc string'
|
|
||||||
'not a docstring'
|
|
||||||
53
|
|
||||||
0x53
|
|
||||||
b'bytes'
|
|
||||||
1.0
|
|
||||||
True
|
|
||||||
False
|
|
||||||
None
|
|
||||||
...
|
|
||||||
'''), ns)
|
|
||||||
|
|
||||||
self.assertEqual(self.dump(ns['optimize_away'].__code__),
|
|
||||||
{'name': 'optimize_away',
|
|
||||||
'argcount': 0,
|
|
||||||
'kwonlyargcount': 0,
|
|
||||||
'names': (),
|
|
||||||
'varnames': (),
|
|
||||||
'cellvars': (),
|
|
||||||
'freevars': (),
|
|
||||||
'nlocals': 0,
|
|
||||||
'flags': 67,
|
|
||||||
'consts': ("'doc string'", 'None')})
|
|
||||||
|
|
||||||
|
|
||||||
class CodeWeakRefTest(unittest.TestCase):
|
class CodeWeakRefTest(unittest.TestCase):
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ import unittest
|
||||||
import sys
|
import sys
|
||||||
# testing import *
|
# testing import *
|
||||||
from sys import *
|
from sys import *
|
||||||
from test import support
|
|
||||||
|
|
||||||
|
|
||||||
class TokenTests(unittest.TestCase):
|
class TokenTests(unittest.TestCase):
|
||||||
|
@ -425,11 +424,8 @@ class GrammarTests(unittest.TestCase):
|
||||||
# Tested below
|
# Tested below
|
||||||
|
|
||||||
def test_expr_stmt(self):
|
def test_expr_stmt(self):
|
||||||
msg = 'ignore constant statement'
|
|
||||||
with support.check_warnings((msg, SyntaxWarning)):
|
|
||||||
exec("1")
|
|
||||||
|
|
||||||
# (exprlist '=')* exprlist
|
# (exprlist '=')* exprlist
|
||||||
|
1
|
||||||
1, 2, 3
|
1, 2, 3
|
||||||
x = 1
|
x = 1
|
||||||
x = 1, 2, 3
|
x = 1, 2, 3
|
||||||
|
|
|
@ -10,9 +10,10 @@ Release date: tba
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
- Issue #26204: The compiler now ignores constant statements (ex: "def f(): 1")
|
- Issue #26204: The compiler now ignores all constant statements: bytes, str,
|
||||||
and emit a SyntaxWarning warning. The warning is not emitted for string and
|
int, float, complex, name constants (None, False, True), Ellipsis
|
||||||
ellipsis (...) statements.
|
and ast.Constant; not only str and int. For example, ``1.0`` is now ignored
|
||||||
|
in ``def f(): 1.0``.
|
||||||
|
|
||||||
- Issue #4806: Avoid masking the original TypeError exception when using star
|
- Issue #4806: Avoid masking the original TypeError exception when using star
|
||||||
(*) unpacking in function calls. Based on patch by Hagen Fürstenau and
|
(*) unpacking in function calls. Based on patch by Hagen Fürstenau and
|
||||||
|
|
|
@ -2619,33 +2619,13 @@ compiler_visit_stmt_expr(struct compiler *c, expr_ty value)
|
||||||
switch (value->kind)
|
switch (value->kind)
|
||||||
{
|
{
|
||||||
case Str_kind:
|
case Str_kind:
|
||||||
case Ellipsis_kind:
|
|
||||||
/* Issue #26204: ignore string statement, but don't emit a
|
|
||||||
* SyntaxWarning. Triple quoted strings is a common syntax for
|
|
||||||
* multiline comments.
|
|
||||||
*
|
|
||||||
* Don't emit warning on "def f(): ..." neither. It's a legit syntax
|
|
||||||
* for abstract function. */
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
case Bytes_kind:
|
|
||||||
case Num_kind:
|
case Num_kind:
|
||||||
|
case Ellipsis_kind:
|
||||||
|
case Bytes_kind:
|
||||||
case NameConstant_kind:
|
case NameConstant_kind:
|
||||||
case Constant_kind:
|
case Constant_kind:
|
||||||
{
|
/* ignore constant statement */
|
||||||
PyObject *msg = PyUnicode_FromString("ignore constant statement");
|
|
||||||
if (msg == NULL)
|
|
||||||
return 0;
|
|
||||||
if (PyErr_WarnExplicitObject(PyExc_SyntaxWarning,
|
|
||||||
msg,
|
|
||||||
c->c_filename, c->u->u_lineno,
|
|
||||||
NULL, NULL) == -1) {
|
|
||||||
Py_DECREF(msg);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
Py_DECREF(msg);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue