GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-29 14:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix conversion from PyUnicode to PgfText. Remove Python 2-style PyString macros.

Browse Source
This commit is contained in:
John J. Camilleri
2021-09-09 23:41:55 +02:00
parent 4739e3d779
commit 2f51c8471c
6 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/python/pypgf.c
View File

@@ -1790,7 +1790,7 @@ PGF_getAbstractName(PGFObject *self, void *closure)
return NULL;
}
PyObject *name = PyString_FromStringAndSize(txt->text, txt->size);
PyObject *name = PyUnicode_FromStringAndSize(txt->text, txt->size);
free(txt);
return name;
}
@@ -1865,7 +1865,7 @@ pgf_collect_cats(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
PgfText* name = key;
PyPGFClosure* clo = (PyPGFClosure*) fn;
PyObject* py_name = PyString_FromStringAndSize(name->text, name->size);
PyObject* py_name = PyUnicode_FromStringAndSize(name->text, name->size);
if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable to create string from category";
@@ -1920,7 +1920,7 @@ pgf_collect_funs(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
PgfText* name = key;
PyPGFClosure* clo = (PyPGFClosure*) fn;
PyObject* py_name = PyString_FromStringAndSize(name->text, name->size);
PyObject* py_name = PyUnicode_FromStringAndSize(name->text, name->size);
if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable to create string from function";