Merge 3.2

merwok · merwok · commit 6f08f53e7978 · 2011-09-02T17:32:30.000+02:00
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -807,7 +807,7 @@ def visitModule(self, mod):
 
 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");
         return 1;
     }
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -604,7 +604,7 @@ static int obj2ast_identifier(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");
         return 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ def visitModule(self, mod):`
`807`	`807`
`808`	`808`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`809`	`809`	`{`
`810`		`- if (!PyUnicode_CheckExact(obj)) {`
	`810`	`+ if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {`
`811`	`811`	`PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
`812`	`812`	`return 1;`
`813`	`813`	`}`
Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`604`	`604`
`605`	`605`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`606`	`606`	`{`
`607`		`- if (!PyUnicode_CheckExact(obj)) {`
	`607`	`+ if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {`
`608`	`608`	`PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
`609`	`609`	`return 1;`
`610`	`610`	`}`