diff options
Diffstat (limited to 'Modules/parsermodule.c')
| -rw-r--r-- | Modules/parsermodule.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 6e52343..2ff67f2 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -105,14 +105,14 @@ node2tuple(node *n, /* node to convert */ } if (TYPE(n) == encoding_decl) - (void) addelem(v, i+1, PyString_FromString(STR(n))); + (void) addelem(v, i+1, PyBytes_FromString(STR(n))); return (v); } else if (ISTERMINAL(TYPE(n))) { PyObject *result = mkseq(2 + lineno + col_offset); if (result != NULL) { (void) addelem(result, 0, PyInt_FromLong(TYPE(n))); - (void) addelem(result, 1, PyString_FromString(STR(n))); + (void) addelem(result, 1, PyBytes_FromString(STR(n))); if (lineno == 1) (void) addelem(result, 2, PyInt_FromLong(n->n_lineno)); if (col_offset == 1) @@ -689,7 +689,7 @@ build_node_children(PyObject *tuple, node *root, int *line_num) temp = PySequence_GetItem(elem, 1); if (temp == NULL) return 0; - if (!PyString_Check(temp)) { + if (!PyBytes_Check(temp)) { PyErr_Format(parser_error, "second item in terminal node must be a string," " found %s", @@ -714,10 +714,10 @@ build_node_children(PyObject *tuple, node *root, int *line_num) Py_DECREF(o); } } - len = PyString_GET_SIZE(temp) + 1; + len = PyBytes_GET_SIZE(temp) + 1; strn = (char *)PyObject_MALLOC(len); if (strn != NULL) - (void) memcpy(strn, PyString_AS_STRING(temp), len); + (void) memcpy(strn, PyBytes_AS_STRING(temp), len); Py_DECREF(temp); } else if (!ISNONTERMINAL(type)) { @@ -800,10 +800,10 @@ build_node_tree(PyObject *tuple) } if (res && encoding) { Py_ssize_t len; - len = PyString_GET_SIZE(encoding) + 1; + len = PyBytes_GET_SIZE(encoding) + 1; res->n_str = (char *)PyObject_MALLOC(len); if (res->n_str != NULL) - (void) memcpy(res->n_str, PyString_AS_STRING(encoding), len); + (void) memcpy(res->n_str, PyBytes_AS_STRING(encoding), len); Py_DECREF(encoding); Py_DECREF(tuple); } |