[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Fri Jul 22 17:55:26 CEST 2011

http://hg.python.org/cpython/rev/75d56cf3020c
changeset: 71456:75d56cf3020c
parent: 71449:44a02d6b74e4
parent: 71454:3301689bd78d
user: Benjamin Peterson <benjamin at python.org>
date: Fri Jul 22 10:55:02 2011 -0500
summary:
 merge 3.2
files:
 Lib/test/test_ast.py | 14 ++++++++++++++
 Misc/NEWS | 3 +++
 Parser/asdl_c.py | 21 +++++++++++++++++++--
 Python/Python-ast.c | 21 +++++++++++++++++++--
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -367,6 +367,20 @@
 compile(m, "<test>", "exec")
 self.assertIn("but got <_ast.expr", str(cm.exception))
 
+ def test_invalid_identitifer(self):
+ m = ast.Module([ast.Expr(ast.Name(42, ast.Load()))])
+ ast.fix_missing_locations(m)
+ with self.assertRaises(TypeError) as cm:
+ compile(m, "<test>", "exec")
+ self.assertIn("identifier must be of type str", str(cm.exception))
+
+ def test_invalid_string(self):
+ m = ast.Module([ast.Expr(ast.Str(42))])
+ ast.fix_missing_locations(m)
+ with self.assertRaises(TypeError) as cm:
+ compile(m, "<test>", "exec")
+ self.assertIn("string must be of type str", str(cm.exception))
+
 
 class ASTHelpers_Test(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Verify the types of AST strings and identifiers provided by the user before
+ compiling them.
+
 - Issue #12579: str.format_map() now raises a ValueError if used on a
 format string that contains positional fields. Initial patch by
 Julian Berman.
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -795,8 +795,25 @@
 return 0;
 }
 
-#define obj2ast_identifier obj2ast_object
-#define obj2ast_string obj2ast_object
+static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,
+ const char *name)
+{
+ if (!PyUnicode_CheckExact(name)) {
+ PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);
+ return 1;
+ }
+ return obj2ast_object(obj, out, arena);
+}
+
+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
+{
+ return obj2ast_stringlike(obj, out, arena, "identifier");
+}
+
+static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
+{
+ return obj2ast_stringlike(obj, out, arena, "string");
+}
 
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
 {
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -592,8 +592,25 @@
 return 0;
 }
 
-#define obj2ast_identifier obj2ast_object
-#define obj2ast_string obj2ast_object
+static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,
+ const char *name)
+{
+ if (!PyUnicode_CheckExact(name)) {
+ PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);
+ return 1;
+ }
+ return obj2ast_object(obj, out, arena);
+}
+
+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
+{
+ return obj2ast_stringlike(obj, out, arena, "identifier");
+}
+
+static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
+{
+ return obj2ast_stringlike(obj, out, arena, "string");
+}
 
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
 {
-- 
Repository URL: http://hg.python.org/cpython
