accept bytes for the AST 'string' type

benjaminp · benjaminp · commit 0224d4e6992f · 2011-08-31T22:13:03.000-04:00
This is a temporary kludge and all is well in 3.3.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.3?
 Core and Builtins
 -----------------
 
+- Accept bytes for the AST string type. This is temporary until a proper fix in
+  3.3.
+
 - Issue #9200: The str.is* methods now work with strings that contain non-BMP
   characters even in narrow Unicode builds.
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -805,7 +805,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
@@ -611,7 +611,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
`@@ -805,7 +805,7 @@ def visitModule(self, mod):`
`805`	`805`
`806`	`806`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`807`	`807`	`{`
`808`		`- if (!PyUnicode_CheckExact(obj)) {`
	`808`	`+ if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {`
`809`	`809`	`PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
`810`	`810`	`return 1;`
`811`	`811`	`}`
Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`611`	`611`
`612`	`612`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`613`	`613`	`{`
`614`		`- if (!PyUnicode_CheckExact(obj)) {`
	`614`	`+ if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {`
`615`	`615`	`PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
`616`	`616`	`return 1;`
`617`	`617`	`}`