From 0224d4e6992fdc91d8c095c7657bfcd7ce7a07a8 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 31 Aug 2011 22:13:03 -0400 Subject: [PATCH] accept bytes for the AST 'string' type This is a temporary kludge and all is well in 3.3. --- Misc/NEWS | 3 +++ Parser/asdl_c.py | 2 +- Python/Python-ast.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index a562d29af3a..4df888f4c7c 100644 --- 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 index 8a7f8aec7f4..249e18ddf42 100755 --- 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 index 8ba06ff39a4..89c07cd602d 100644 --- 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; }