X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/be17c8c27ee7ae2e14fe34bb517484a11b1cf300..cfb291f03e0882cba9037be2a2756a6af41fb76a:/catacomb.c diff --git a/catacomb.c b/catacomb.c index 7d3cba7..c1e91ff 100644 --- a/catacomb.c +++ b/catacomb.c @@ -128,7 +128,7 @@ static void *thingtab_gmlookup(PyObject *me, PyObject *key, unsigned *f) { const char *p; - p = PyString_AsString(key); if (!p) return (0); + p = TEXT_STR(key); if (!p) return (0); return (sym_find(THINGTAB_T(me), p, -1, 0, f)); } @@ -139,7 +139,7 @@ static void *thingtab_gmiternext(PyObject *me, void *i) { sym_iter *it = i; void *e; SYM_NEXT(it, e); return (e); } static PyObject *thingtab_gmentrykey(PyObject *me, void *e) - { return (PyString_FromString(SYM_NAME(e))); } + { return (TEXT_FROMSTR(SYM_NAME(e))); } static PyObject *thingtab_gmentryvalue(PyObject *me, void *e) { PyObject *rc = THING_VAL(e); RETURN_OBJ(rc); } @@ -325,7 +325,7 @@ EXPORT void init_base(void) { PyObject *mod; - modname = PyString_FromString("catacomb"); + modname = TEXT_FROMSTR("catacomb"); addmethods(methods); INIT_MODULES; INITTYPE(thingtab, root);