traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.2

This commit is contained in:
Éric Araujo 2011-09-02 17:32:30 +02:00
parent 677dc7189f d9e1789364
commit 6f08f53e79
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Parser/asdl_c.py
View File

@ -807,7 +807,7 @@ static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena) static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
{ {
if (!PyUnicode_CheckExact(obj)) { if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError, "AST string must be of type str"); PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
return 1; return 1;
} }

2
Python/Python-ast.c
View File

@ -604,7 +604,7 @@ static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena) static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
{ {
if (!PyUnicode_CheckExact(obj)) { if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError, "AST string must be of type str"); PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
return 1; return 1;
} }