[Python-checkins] cpython: Issue #12705: Raise SyntaxError when compiling multiple statements as single
meador.inge
python-checkins at python.org
Thu Jan 19 08:11:10 CET 2012
http://hg.python.org/cpython/rev/2bd7f40108b4
changeset: 74520:2bd7f40108b4
user: Meador Inge <meadori at gmail.com>
date: Thu Jan 19 01:08:41 2012 -0600
summary:
Issue #12705: Raise SyntaxError when compiling multiple statements as single interactive statement
files:
Include/errcode.h | 1 +
Lib/test/test_compile.py | 28 ++++++++++++++++++++++++++++
Misc/NEWS | 3 +++
Parser/parsetok.c | 17 +++++++++++++++++
Python/pythonrun.c | 3 +++
5 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/Include/errcode.h b/Include/errcode.h
--- a/Include/errcode.h
+++ b/Include/errcode.h
@@ -30,6 +30,7 @@
#define E_EOLS 24 /* EOL in single-quoted string */
#define E_LINECONT 25 /* Unexpected characters after a line continuation */
#define E_IDENTIFIER 26 /* Invalid characters in identifier */
+#define E_BADSINGLE 27 /* Ill-formed single statement input */
#ifdef __cplusplus
}
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -6,6 +6,12 @@
class TestSpecifics(unittest.TestCase):
+ def compile_single(self, source):
+ compile(source, "<single>", "single")
+
+ def assertInvalidSingle(self, source):
+ self.assertRaises(SyntaxError, self.compile_single, source)
+
def test_no_ending_newline(self):
compile("hi", "<test>", "exec")
compile("hi\r", "<test>", "exec")
@@ -442,6 +448,28 @@
if isinstance(obj, types.CodeType):
self.assertIs(obj.co_filename, c.co_filename)
+ def test_single_statement(self):
+ self.compile_single("1 + 2")
+ self.compile_single("\n1 + 2")
+ self.compile_single("1 + 2\n")
+ self.compile_single("1 + 2\n\n")
+ self.compile_single("1 + 2\t\t\n")
+ self.compile_single("1 + 2\t\t\n ")
+ self.compile_single("1 + 2 # one plus two")
+ self.compile_single("1; 2")
+ self.compile_single("import sys; sys")
+ self.compile_single("def f():\n pass")
+ self.compile_single("while False:\n pass")
+ self.compile_single("if x:\n f(x)")
+ self.compile_single("if x:\n f(x)\nelse:\n g(x)")
+ self.compile_single("class T:\n pass")
+
+ def test_bad_single_statement(self):
+ self.assertInvalidSingle('1\n2')
+ self.assertInvalidSingle('def f(): pass')
+ self.assertInvalidSingle('a = 13\nb = 187')
+ self.assertInvalidSingle('del x\ndel y')
+ self.assertInvalidSingle('f()\ng()')
def test_main():
support.run_unittest(TestSpecifics)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #12705: A SyntaxError exception is now raised when attempting to
+ compile multiple statements as a single interactive statement.
+
- Fix the builtin module initialization code to store the init function for
future reinitialization.
diff --git a/Parser/parsetok.c b/Parser/parsetok.c
--- a/Parser/parsetok.c
+++ b/Parser/parsetok.c
@@ -224,6 +224,23 @@
if (err_ret->error == E_DONE) {
n = ps->p_tree;
ps->p_tree = NULL;
+
+ /* Check that the source for a single input statement really
+ is a single statement by looking at what is left in the
+ buffer after parsing. Trailing whitespace and comments
+ are OK. */
+ if (start == single_input) {
+ char *cur = tok->cur;
+ char c = *tok->cur;
+
+ while (c == ' ' || c == '\t' || c == '\n' || c == '\014')
+ c = *++cur;
+
+ if (c && c != '#') {
+ err_ret->error = E_BADSINGLE;
+ n = NULL;
+ }
+ }
}
else
n = NULL;
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -2129,6 +2129,9 @@
case E_IDENTIFIER:
msg = "invalid character in identifier";
break;
+ case E_BADSINGLE:
+ msg = "multiple statements found while compiling a single statement";
+ break;
default:
fprintf(stderr, "error=%d\n", err->error);
msg = "unknown parsing error";
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list