*.c: Separate string function calls according to text/binary usage.

[catacomb-python] / group.c

diff --git a/group.c b/group.c
index 0feb109..b51cb6a 100644 (file)
--- a/group.c
+++ b/group.c
@@ -493,6 +493,7 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   ec p = EC_INIT;
   mp *y = 0;
   ge *xx = 0;
+  size_t n;
   mptext_stringctx sc;
 
   g = GROUP_G(ty);
@@ -507,9 +508,8 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
     if (G_FROMINT(g, xx, y))
       TYERR("can't convert from integer");
     MP_DROP(y);
-  } else if (PyString_Check(x)) {
-    sc.buf = PyString_AS_STRING(x);
-    sc.lim = sc.buf + PyString_GET_SIZE(x);
+  } else if (TEXT_CHECK(x)) {
+    TEXT_PTRLEN(x, sc.buf, n); sc.lim = sc.buf + n;
     if (G_READ(g, xx, &mptext_stringops, &sc) || sc.buf < sc.lim)
       VALERR("malformed group element string");
   } else
@@ -661,7 +661,7 @@ static PyObject *ge_pystr(PyObject *me)
   PyObject *rc;
 
   group_writedstr(GE_G(me), GE_X(me), &d);
-  rc = PyString_FromStringAndSize(d.buf, d.len);
+  rc = TEXT_FROMSTRLEN(d.buf, d.len);
   DDESTROY(&d);
   return (rc);
 }
@@ -746,10 +746,10 @@ static PyObject *gemeth_tobuf(PyObject *me)
 
   n = GE_G(me)->noctets + 4;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   G_TOBUF(GE_G(me), &b, GE_X(me));
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
@@ -761,10 +761,10 @@ static PyObject *gemeth_toraw(PyObject *me)
 
   n = GE_G(me)->noctets;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   G_TORAW(GE_G(me), &b, GE_X(me));
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }