diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-07-22 16:09:07 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-07-22 16:09:07 (GMT) |
commit | 180e63507dde824afb48ea9c1649755b79258935 (patch) | |
tree | f3b25ac82890c7114d271df4ef4d8ddcffb7c98c /Parser | |
parent | efad2449fc14501fd4e98cb120ac0c19f82d4e78 (diff) | |
download | cpython-180e63507dde824afb48ea9c1649755b79258935.zip cpython-180e63507dde824afb48ea9c1649755b79258935.tar.gz cpython-180e63507dde824afb48ea9c1649755b79258935.tar.bz2 |
None is ok for identifiers but not strings
Diffstat (limited to 'Parser')
-rwxr-xr-x | Parser/asdl_c.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 6598375..8a7f8ae 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -794,24 +794,22 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena) return 0; } -static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena, - const char *name) +static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena) { - if (!PyUnicode_CheckExact(name)) { - PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name); + if (!PyUnicode_CheckExact(obj) && obj != Py_None) { + PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str"); 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"); + if (!PyUnicode_CheckExact(obj)) { + PyErr_SetString(PyExc_TypeError, "AST string must be of type str"); + return 1; + } + return obj2ast_object(obj, out, arena); } static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) |