mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

verify the types of AST strings and identifiers (closes #12609 and #12610)

Browse source
This commit is contained in:
Benjamin Peterson 2011-07-22 10:39:50 -05:00
parent 59c69512be
commit 77820242dd
3 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_ast.py
View file

@ -362,6 +362,20 @@ class AST_Tests(unittest.TestCase):
ast2 = mod.loads(mod.dumps(ast, protocol)) ast2 = mod.loads(mod.dumps(ast, protocol))
self.assertEqual(to_tuple(ast2), to_tuple(ast)) self.assertEqual(to_tuple(ast2), to_tuple(ast))
def test_invalid_identitifer(self):
m = ast.Module([ast.Expr(ast.Name(u"x", 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(43))])
ast.fix_missing_locations(m)
with self.assertRaises(TypeError) as cm:
compile(m, "<test>", "exec")
self.assertIn("string must be of type str or uni", str(cm.exception))
class ASTHelpers_Test(unittest.TestCase): class ASTHelpers_Test(unittest.TestCase):

21
Parser/asdl_c.py
View file

@ -800,8 +800,25 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
return 0; return 0;
} }
#define obj2ast_identifier obj2ast_object static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
#define obj2ast_string obj2ast_object {
if (!PyString_CheckExact(obj)) {
PyErr_Format(PyExc_TypeError,
"AST identifier must be of type str");
return 1;
}
return obj2ast_object(obj, out, arena);
}
static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
{
if (!PyString_CheckExact(obj) && !PyUnicode_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError,
"AST string must be of type str or unicode");
return 1;
}
return obj2ast_object(obj, out, arena);
}
static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
{ {

25
Python/Python-ast.c
View file

@ -2,7 +2,7 @@
/* /*
__version__ 82160. __version__ .
This module must be committed separately after each AST grammar change; This module must be committed separately after each AST grammar change;
The __version__ number is set to the revision number of the commit The __version__ number is set to the revision number of the commit
@ -594,8 +594,25 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
return 0; return 0;
} }
#define obj2ast_identifier obj2ast_object static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
#define obj2ast_string obj2ast_object {
if (!PyString_CheckExact(obj)) {
PyErr_Format(PyExc_TypeError,
"AST identifier must be of type str");
return 1;
}
return obj2ast_object(obj, out, arena);
}
static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
{
if (!PyString_CheckExact(obj) && !PyUnicode_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError,
"AST string must be of type str or unicode");
return 1;
}
return obj2ast_object(obj, out, arena);
}
static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
{ {
@ -6570,7 +6587,7 @@ init_ast(void)
if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return; if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return;
if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0) if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)
return; return;
if (PyModule_AddStringConstant(m, "__version__", "82160") < 0) if (PyModule_AddStringConstant(m, "__version__", "") < 0)
return; return;
if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return; if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return;
if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0) if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)