commit 6f08f53e797848b6e2f5e7eeaf20f9dcaba3e28b
author Éric Araujo <merwok@netwok.org> Fri Sep 02 17:32:30 2011 +0200
committer Éric Araujo <merwok@netwok.org> Fri Sep 02 17:32:30 2011 +0200
tree 253d2788c0e129c3e790359ef72b2cc2a6ac6771
parent 677dc7189f6c79f1a534f6e8de89758593934cb3
parent d9e1789364ede11e1d48b7ba1afe0369c78c6424

Merge 3.2

Parser/asdl_c.py

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 0b95aaa..c66082e 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -807,7 +807,7 @@
 
 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;
     }

Python/Python-ast.c

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index f6e345c..ff79757 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -604,7 +604,7 @@
 
 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;
     }