X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/83eec59f8263d6951b527e1d7d723aa87b161bca..9ef0b2c998221c494dd446684e821f957c51e303:/mp.c

diff --git a/mp.c b/mp.c
index 31eec24..fe5e7dc 100644
--- a/mp.c
+++ b/mp.c
@@ -33,6 +33,17 @@
 PyTypeObject *mp_pytype = 0;
 PyTypeObject *gf_pytype = 0;
 
+#ifndef PyLong_SHIFT
+#  define PyLong_SHIFT SHIFT
+#endif
+
+#ifndef PyLong_MASK
+#  define PyLong_MASK MASK
+#endif
+
+STATIC_ASSERT(MPW_BITS >= PyLong_SHIFT,
+	      "Catacomb's limbs are now narrower than than Python's!");
+
 mp *mp_frompylong(PyObject *obj)
 {
   unsigned long bits;
@@ -45,16 +56,15 @@ mp *mp_frompylong(PyObject *obj)
   mp *x;
   mpw *p;
 
-  sz = l->ob_size;
+  sz = Py_SIZE(l);
   if (sz < 0) sz = -sz;
-  assert(MPW_BITS >= SHIFT);
-  bits = (unsigned long)sz * SHIFT;
+  bits = (unsigned long)sz * PyLong_SHIFT;
   w = (bits + MPW_BITS - 1)/MPW_BITS;
-  x = mp_new(w, l->ob_size < 0 ? MP_NEG : 0);
+  x = mp_new(w, Py_SIZE(l) < 0 ? MP_NEG : 0);
   p = x->v;
   for (i = 0; i < sz; i++) {
     r |= (mpd)l->ob_digit[i] << b;
-    b += SHIFT;
+    b += PyLong_SHIFT;
     while (b >= MPW_BITS) {
       *p++ = MPW(r);
       r >>= MPW_BITS;
@@ -73,28 +83,27 @@ mp *mp_frompylong(PyObject *obj)
 PyObject *mp_topylong(mp *x)
 {
   unsigned long bits = mp_bits(x);
-  int sz = (bits + SHIFT - 1)/SHIFT;
+  int sz = (bits + PyLong_SHIFT - 1)/PyLong_SHIFT;
   PyLongObject *l = _PyLong_New(sz);
   mpd r = 0;
   int b = 0;
   mpw *p = x->v;
   int i = 0;
 
-  assert(MPW_BITS >= SHIFT);
   while (i < sz && p < x->vl) {
     r |= (mpd)*p++ << b;
     b += MPW_BITS;
-    while (i < sz && b >= SHIFT) {
-      l->ob_digit[i++] = r & MASK;
-      r >>= SHIFT;
-      b -= SHIFT;
+    while (i < sz && b >= PyLong_SHIFT) {
+      l->ob_digit[i++] = r & PyLong_MASK;
+      r >>= PyLong_SHIFT;
+      b -= PyLong_SHIFT;
     }
   }
   while (i < sz && r) {
-    l->ob_digit[i++] = r & MASK;
-    r >>= SHIFT;
+    l->ob_digit[i++] = r & PyLong_MASK;
+    r >>= PyLong_SHIFT;
   }
-  l->ob_size = (x->f & MP_NEG) ? -sz : sz;
+  Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz;
   return ((PyObject *)l);
 }
 
@@ -102,11 +111,11 @@ mp *mp_frompyobject(PyObject *o, int radix)
 {
   mp *x;
 
-  if (PyString_Check(o)) {
+  if (TEXT_CHECK(o)) {
     mptext_stringctx sc;
     mp *x;
-    sc.buf = PyString_AS_STRING(o);
-    sc.lim = sc.buf + PyString_GET_SIZE(o);
+    size_t sz;
+    TEXT_PTRLEN(o, sc.buf, sz); sc.lim = sc.buf + sz;
     x = mp_read(MP_NEW, radix, &mptext_stringops, &sc);
     if (!x) return (0);
     if (sc.buf < sc.lim) { MP_DROP(x); return (0); }
@@ -128,8 +137,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   size_t postlen = post ? strlen(post) : 0;
   char *p;
   MP_COPY(x);
-  o = PyString_FromStringAndSize(0, len + 1 + xprelen + prelen + postlen);
-  p = PyString_AS_STRING(o);
+  TEXT_PREPAREWRITE(o, p, len + 1 + xprelen + prelen + postlen);
   sc.buf = p;
   if (xpre) { memcpy(sc.buf, xpre, xprelen); sc.buf += xprelen; }
   if (MP_NEGP(x)) { *sc.buf++ = '-'; x = mp_neg(x, x); }
@@ -138,7 +146,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   mp_write(x, radix, &mptext_stringops, &sc);
   if (post) { memcpy(sc.buf, post, postlen); sc.buf += postlen; }
   MP_DROP(x);
-  _PyString_Resize(&o, sc.buf - p);
+  TEXT_DONEWRITE(o, sc.buf - p);
   return (o);
 }
 
@@ -238,7 +246,7 @@ mp *getmp(PyObject *o)
   if (!o) return (0);
   if ((x = tomp(o)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp",
-		 o->ob_type->tp_name);
+		 Py_TYPE(o)->tp_name);
   }
   return (x);
 }
@@ -257,7 +265,7 @@ mp *getgf(PyObject *o)
   if (!o) return (0);
   if ((x = tomp(o)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf",
-		 o->ob_type->tp_name);
+		 Py_TYPE(o)->tp_name);
   }
   return (x);
 }
@@ -536,7 +544,7 @@ static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   if (!good_radix_p(radix, 1)) VALERR("bad radix");
   if ((z = mp_frompyobject(x, radix)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp",
-		 x->ob_type->tp_name);
+		 Py_TYPE(x)->tp_name);
     goto end;
   }
   zz = (mp_pyobj *)ty->tp_alloc(ty, 0);
@@ -545,14 +553,14 @@ end:
   return ((PyObject *)zz);
 }
 
-long mphash(mp *x)
+Py_hash_t mphash(mp *x)
 {
   PyObject *l = mp_topylong(x);
-  long h = PyObject_Hash(l);
+  Py_hash_t h = PyObject_Hash(l);
   Py_DECREF(l); return (h);
 }
 
-static long mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
+static Py_hash_t mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
 
 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
@@ -593,25 +601,20 @@ static PyObject *gfmeth_testbit(PyObject *me, PyObject *arg)
   return (getbool(mp_testbit(MP_X(me), i)));
 }
 
-static PyObject *mpmeth_odd(PyObject *me, PyObject *arg)
+static PyObject *mpmeth_odd(PyObject *me)
 {
   mp *t;
   size_t s;
 
-  if (!PyArg_ParseTuple(arg, ":odd")) return (0);
   t = mp_odd(MP_NEW, MP_X(me), &s);
   return (Py_BuildValue("(lN)", (long)s, mp_pywrap(t)));
 }
 
-static PyObject *mpmeth_sqr(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":sqr")) return (0);
-  return (mp_pywrap(mp_sqr(MP_NEW, MP_X(me))));
-}
+static PyObject *mpmeth_sqr(PyObject *me)
+  { return (mp_pywrap(mp_sqr(MP_NEW, MP_X(me)))); }
 
-static PyObject *mpmeth_sqrt(PyObject *me, PyObject *arg)
+static PyObject *mpmeth_sqrt(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":sqrt")) return (0);
   if (MP_NEGP(MP_X(me))) VALERR("negative root");
   return (mp_pywrap(mp_sqrt(MP_NEW, MP_X(me))));
 end:
@@ -703,7 +706,7 @@ end:
 				 PyObject *arg, PyObject *kw)		\
   {									\
     long len = -1;							\
-    static const char *const kwlist[] = { "len", 0 };					\
+    static const char *const kwlist[] = { "len", 0 };			\
     PyObject *rc = 0;							\
 									\
     if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name,		\
@@ -714,7 +717,7 @@ end:
       if (!len) len = 1;						\
     }									\
     rc = bytestring_pywrap(0, len);					\
-    mp_##name(MP_X(me), PyString_AS_STRING(rc), len);			\
+    mp_##name(MP_X(me), BIN_PTR(rc), len);				\
   end:									\
     return (rc);							\
   }
@@ -724,42 +727,40 @@ STOREOP(storel2c, 2c)
 STOREOP(storeb2c, 2c)
 #undef STOREOP
 
-#define BUFOP(ty, pyty)							\
-  static PyObject *meth__##pyty##_frombuf(PyObject *me, PyObject *arg)	\
+#define BUFOP(ty)							\
+  static PyObject *ty##meth_frombuf(PyObject *me, PyObject *arg)	\
   {									\
     buf b;								\
-    char *p;								\
-    Py_ssize_t sz;							\
+    struct bin in;							\
     PyObject *rc = 0;							\
     mp *x;								\
 									\
-    if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &sz)) goto end;	\
-    buf_init(&b, p, sz);						\
+    if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) goto end;	\
+    buf_init(&b, (/*unconst*/ void *)in.p, in.sz);			\
     if ((x = buf_getmp(&b)) == 0) VALERR("malformed data");		\
     rc = Py_BuildValue("(NN)", ty##_pywrap(x),				\
 		       bytestring_pywrapbuf(&b));			\
   end:									\
     return (rc);							\
   }
-BUFOP(mp, MP)
-BUFOP(gf, GF)
+BUFOP(mp)
+BUFOP(gf)
 #undef BUFOP
 
-static PyObject *mpmeth_tobuf(PyObject *me, PyObject *arg)
+static PyObject *mpmeth_tobuf(PyObject *me)
 {
   buf b;
   PyObject *rc;
   mp *x;
   size_t n;
 
-  if (!PyArg_ParseTuple(arg, ":tobuf")) return (0);
   x = MP_X(me);
   n = mp_octets(x) + 3;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   buf_putmp(&b, x);
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
@@ -776,6 +777,63 @@ end:
   return (rc);
 }
 
+static PyObject *mpmeth_fromstring(PyObject *me,
+				   PyObject *arg, PyObject *kw)
+{
+  int r = 0;
+  char *p;
+  Py_ssize_t len;
+  PyObject *z = 0;
+  mp *zz;
+  mptext_stringctx sc;
+  static const char *const kwlist[] = { "x", "radix", 0 };
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|i:fromstring", KWLIST,
+				   &p, &len, &r))
+    goto end;
+  if (!good_radix_p(r, 1)) VALERR("bad radix");
+  sc.buf = p; sc.lim = p + len;
+  if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0)
+    VALERR("bad integer");
+  z = Py_BuildValue("(Ns#)", mp_pywrap(zz),
+		    sc.buf, (Py_ssize_t)(sc.lim - sc.buf));
+end:
+  return (z);
+}
+
+static PyObject *mpmeth_factorial(PyObject *me, PyObject *arg)
+{
+  unsigned long i;
+  mp *x;
+  if (!PyArg_ParseTuple(arg, "O&:factorial", convulong, &i)) return (0);
+  x = mp_factorial(i);
+  return mp_pywrap(x);
+}
+
+static PyObject *mpmeth_fibonacci(PyObject *me, PyObject *arg)
+{
+  long i;
+  mp *x;
+  if (!PyArg_ParseTuple(arg, "l:fibonacci", &i)) return (0);
+  x = mp_fibonacci(i);
+  return mp_pywrap(x);
+}
+
+#define LOADOP(pre, name)						\
+  static PyObject *pre##meth_##name(PyObject *me, PyObject *arg)	\
+  {									\
+    struct bin in;							\
+    if (!PyArg_ParseTuple(arg, "O&:" #name, convbin, &in)) return (0);	\
+    return (pre##_pywrap(mp_##name(MP_NEW, in.p, in.sz)));		\
+  }
+LOADOP(mp, loadl)
+LOADOP(mp, loadb)
+LOADOP(mp, loadl2c)
+LOADOP(mp, loadb2c)
+LOADOP(gf, loadl)
+LOADOP(gf, loadb)
+#undef LOADOP
+
 static PyObject *mpget_nbits(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(mp_bits(MP_X(me)))); }
 
@@ -785,7 +843,7 @@ static PyObject *mpget_noctets(PyObject *me, void *hunoz)
 static PyObject *mpget_noctets2c(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(mp_octets2c(MP_X(me)))); }
 
-static PyGetSetDef mp_pygetset[] = {
+static const PyGetSetDef mp_pygetset[] = {
 #define GETSETNAME(op, func) mp##op##_##func
   GET	(nbits,		"X.nbits -> bit length of X")
   GET	(noctets,	"X.noctets -> octet length of X")
@@ -794,36 +852,49 @@ static PyGetSetDef mp_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef mp_pymethods[] = {
+static const PyMethodDef mp_pymethods[] = {
 #define METHNAME(func) mpmeth_##func
   METH	(jacobi,	"X.jacobi(Y) -> Jacobi symbol (Y|X) (NB inversion!)")
   METH	(setbit,	"X.setbit(N) -> X with bit N set")
   METH	(clearbit,	"X.clearbit(N) -> X with bit N clear")
   METH	(testbit,	"X.testbit(N) -> true/false if bit N set/clear in X")
-  METH	(odd,		"X.odd() -> S, T where X = 2^S T with T odd")
-  METH	(sqr,		"X.sqr() -> X^2")
-  METH	(sqrt,		"X.sqrt() -> largest integer <= sqrt(X)")
+  NAMETH(odd,		"X.odd() -> S, T where X = 2^S T with T odd")
+  NAMETH(sqr,		"X.sqr() -> X^2")
+  NAMETH(sqrt,		"X.sqrt() -> largest integer <= sqrt(X)")
   METH	(gcd,		"X.gcd(Y) -> gcd(X, Y)")
-  METH	(gcdx,
-	 "X.gcdx(Y) -> (gcd(X, Y), U, V) with X U + Y V = gcd(X, Y)")
+  METH	(gcdx,		"X.gcdx(Y) -> (gcd(X, Y), U, V) "
+						"with X U + Y V = gcd(X, Y)")
   METH	(modinv,	"X.modinv(Y) -> multiplicative inverse of Y mod X")
   METH	(modsqrt,	"X.modsqrt(Y) -> square root of Y mod X, if X prime")
-  METH	(leastcongruent,
-	 "X.leastcongruent(B, M) -> smallest Z >= B with Z == X (mod M)")
-  KWMETH(primep,	"X.primep([rng = rand]) -> true/false if X is prime")
+  METH	(leastcongruent, "X.leastcongruent(B, M) -> "
+				       "smallest Z >= B with Z == X (mod M)")
+  KWMETH(primep,	"X.primep([rng = rand]) -> X is prime?")
   KWMETH(tostring,	"X.tostring([radix = 10]) -> STR")
   KWMETH(storel,	"X.storel([len = -1]) -> little-endian bytes")
   KWMETH(storeb,	"X.storeb([len = -1]) -> big-endian bytes")
-  KWMETH(storel2c,
-	 "X.storel2c([len = -1]) -> little-endian bytes, two's complement")
-  KWMETH(storeb2c,
-	 "X.storeb2c([len = -1]) -> big-endian bytes, two's complement")
-  METH	(tobuf,		"X.tobuf() -> buffer format")
+  KWMETH(storel2c,	"X.storel2c([len = -1]) -> "
+				     "little-endian bytes, two's complement")
+  KWMETH(storeb2c,	"X.storeb2c([len = -1]) -> "
+					"big-endian bytes, two's complement")
+  NAMETH(tobuf,		"X.tobuf() -> buffer format")
+  KWSMTH(fromstring,	"fromstring(STR, [radix = 0]) -> (X, REST)\n"
+    "  Parse STR as a large integer, according to RADIX.  If RADIX is\n"
+    "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
+    "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH	(factorial,	"factorial(I) -> I!: compute factorial")
+  SMTH	(fibonacci,	"fibonacci(I) -> F(I): compute Fibonacci number")
+  SMTH	(loadl,		"loadl(STR) -> X: read little-endian bytes")
+  SMTH	(loadb,		"loadb(STR) -> X: read big-endian bytes")
+  SMTH	(loadl2c,	"loadl2c(STR) -> X: "
+				"read little-endian bytes, two's complement")
+  SMTH	(loadb2c,	"loadb2c(STR) -> X: "
+				   "read big-endian bytes, two's complement")
+  SMTH	(frombuf,	"frombuf(STR) -> (X, REST): read buffer format")
 #undef METHNAME
   { 0 }
 };
 
-static PyNumberMethods mp_pynumber = {
+static const PyNumberMethods mp_pynumber = {
   mp_pyadd,				/* @nb_add@ */
   mp_pysub,				/* @nb_subtract@ */
   mp_pymul,				/* @nb_multiply@ */
@@ -866,8 +937,8 @@ static PyNumberMethods mp_pynumber = {
   0,					/* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject mp_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mp_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MP",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -878,7 +949,7 @@ static PyTypeObject mp_pytype_skel = {
   0,					/* @tp_setattr@ */
   mp_pycompare,				/* @tp_compare@ */
   mp_pyrepr,				/* @tp_repr@ */
-  &mp_pynumber,				/* @tp_as_number@ */
+  PYNUMBER(mp),				/* @tp_as_number@ */
   0,					/* @tp_as_sequence@ */
   0,					/* @tp_as_mapping@ */
   mp_pyhash,				/* @tp_hash@ */
@@ -892,20 +963,20 @@ static PyTypeObject mp_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Multiprecision integers, similar to `long' but more efficient and\n\
-versatile.  Support all the standard arithmetic operations, with\n\
-implicit conversions from `PrimeFilter', and other objects which\n\
-convert to `long'.\n\
-\n\
-Constructor MP(X, [radix = R]) attempts to convert X to an `MP'.  If\n\
-X is a string, it's read in radix-R form, or we look for a prefix\n\
-if R = 0.  Other acceptable things are field elements, elliptic curve\n\
-points, group elements, Python `int' and `long' objects, and anything\n\
-with an integer conversion.\n\
-\n\
-Notes:\n\
-\n\
-  * Use `//' for integer division: `/' gives exact rational division.",
+  "Multiprecision integers, similar to `long' but more efficient and\n"
+  "versatile.  Support all the standard arithmetic operations, with\n"
+  "implicit conversions from `PrimeFilter', and other objects which\n"
+  "convert to `long'.\n"
+  "\n"
+  "Constructor MP(X, [radix = R]) attempts to convert X to an `MP'.  If\n"
+  "X is a string, it's read in radix-R form, or we look for a prefix\n"
+  "if R = 0.  Other acceptable things are field elements, elliptic curve\n"
+  "points, group elements, Python `int' and `long' objects, and anything\n"
+  "with an integer conversion.\n"
+  "\n"
+  "Notes:\n"
+  "\n"
+  "  * Use `//' for integer division: `/' gives exact rational division.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -913,9 +984,9 @@ Notes:\n\
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mp_pymethods,				/* @tp_methods@ */
+  PYMETHODS(mp),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mp_pygetset,				/* @tp_getset@ */
+  PYGETSET(mp),				/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -928,67 +999,10 @@ Notes:\n\
   0					/* @tp_is_gc@ */
 };
 
-static PyObject *meth__MP_fromstring(PyObject *me,
-				     PyObject *arg, PyObject *kw)
-{
-  int r = 0;
-  char *p;
-  Py_ssize_t len;
-  PyObject *z = 0;
-  mp *zz;
-  mptext_stringctx sc;
-  static const char *const kwlist[] = { "class", "x", "radix", 0 };
-
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring",
-				   KWLIST, &me, &p, &len, &r))
-    goto end;
-  if (!good_radix_p(r, 1)) VALERR("bad radix");
-  sc.buf = p; sc.lim = p + len;
-  if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0)
-    VALERR("bad integer");
-  z = Py_BuildValue("(Ns#)", mp_pywrap(zz),
-		    sc.buf, (Py_ssize_t)(sc.lim - sc.buf));
-end:
-  return (z);
-}
-
-static PyObject *meth__MP_factorial(PyObject *me, PyObject *arg)
-{
-  unsigned long i;
-  mp *x;
-  if (!PyArg_ParseTuple(arg, "OO&:factorial", &me, convulong, &i))
-    return (0);
-  x = mp_factorial(i);
-  return mp_pywrap(x);
-}
-
-static PyObject *meth__MP_fibonacci(PyObject *me, PyObject *arg)
-{
-  long i;
-  mp *x;
-  if (!PyArg_ParseTuple(arg, "Ol:fibonacci", &me, &i)) return (0);
-  x = mp_fibonacci(i);
-  return mp_pywrap(x);
-}
-
-#define LOADOP(pre, py, name)						\
-  static PyObject *meth__##py##_##name(PyObject *me, PyObject *arg)	\
-  {									\
-    char *p;								\
-    Py_ssize_t len;							\
-    if (!PyArg_ParseTuple(arg, "Os#:" #name, &me, &p, &len)) return (0); \
-    return (pre##_pywrap(mp_##name(MP_NEW, p, len)));			\
-  }
-LOADOP(mp, MP, loadl)
-LOADOP(mp, MP, loadb)
-LOADOP(mp, MP, loadl2c)
-LOADOP(mp, MP, loadb2c)
-LOADOP(gf, GF, loadl)
-LOADOP(gf, GF, loadb)
-#undef LOADOP
-
 /*----- Products of small integers ----------------------------------------*/
 
+static PyTypeObject *mpmul_pytype;
+
 typedef struct mpmul_pyobj {
   PyObject_HEAD
   int livep;
@@ -1011,10 +1025,10 @@ static PyObject *mmmeth_factor(PyObject *me, PyObject *arg)
   mp *x;
 
   if (!MPMUL_LIVEP(me)) VALERR("MPMul object invalid");
-  if (PyTuple_Size(arg) != 1)
+  if (PyTuple_GET_SIZE(arg) != 1)
     i = PyObject_GetIter(arg);
   else {
-    if ((q = PyTuple_GetItem(arg, 0)) == 0) goto end;
+    if ((q = PyTuple_GET_ITEM(arg, 0)) == 0) goto end;
     if ((i = PyObject_GetIter(q)) == 0) {
       PyErr_Clear(); /* that's ok */
       i = PyObject_GetIter(arg);
@@ -1035,11 +1049,10 @@ end:
   return (0);
 }
 
-static PyObject *mmmeth_done(PyObject *me, PyObject *arg)
+static PyObject *mmmeth_done(PyObject *me)
 {
   mp *x;
 
-  if (!PyArg_ParseTuple(arg, ":done")) goto end;
   if (!MPMUL_LIVEP(me)) VALERR("MPMul object invalid");
   x = mpmul_done(MPMUL_PY(me));
   MPMUL_LIVEP(me) = 0;
@@ -1068,23 +1081,23 @@ end:
 static PyObject *mmget_livep(PyObject *me, void *hunoz)
   { return (getbool(MPMUL_LIVEP(me))); }
 
-static PyGetSetDef mpmul_pygetset[] = {
+static const PyGetSetDef mpmul_pygetset[] = {
 #define GETSETNAME(op, name) mm##op##_##name
-  GET	(livep,			"MM.livep -> flag: object still valid?")
+  GET	(livep,		"MM.livep -> flag: object still valid?")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef mpmul_pymethods[] = {
+static const PyMethodDef mpmul_pymethods[] = {
 #define METHNAME(name) mmmeth_##name
-  METH	(factor,		"MM.factor(ITERABLE) or MM.factor(I, ...)")
-  METH	(done,			"MM.done() -> PRODUCT")
+  METH	(factor,	"MM.factor(ITERABLE) or MM.factor(I, ...)")
+  NAMETH(done,		"MM.done() -> PRODUCT")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpmul_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMul",				/* @tp_name@ */
   sizeof(mpmul_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1108,7 +1121,7 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"MPMul(N_0, N_1, ....): an object for multiplying many small integers.",
+  "MPMul(N_0, N_1, ....): an object for multiplying many small integers.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1116,9 +1129,9 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mpmul_pymethods,			/* @tp_methods@ */
+  PYMETHODS(mpmul),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mpmul_pygetset,			/* @tp_getset@ */
+  PYGETSET(mpmul),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1133,6 +1146,8 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
 
 /*----- Montgomery reduction ----------------------------------------------*/
 
+static PyTypeObject *mpmont_pytype;
+
 typedef struct mpmont_pyobj {
   PyObject_HEAD
   mpmont mm;
@@ -1323,7 +1338,7 @@ static PyObject *mmget_r(PyObject *me, void *hunoz)
 static PyObject *mmget_r2(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(MPMONT_PY(me)->r2))); }
 
-static PyGetSetDef mpmont_pygetset[] = {
+static const PyGetSetDef mpmont_pygetset[] = {
 #define GETSETNAME(op, name) mm##op##_##name
   GET	(m,		"M.m -> modulus for reduction")
   GET	(r,		"M.r -> multiplicative identity")
@@ -1332,26 +1347,26 @@ static PyGetSetDef mpmont_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef mpmont_pymethods[] = {
+static const PyMethodDef mpmont_pymethods[] = {
 #define METHNAME(name) mmmeth_##name
   METH	(int,		"M.int(X) -> XR")
   METH	(mul,		"M.mul(XR, YR) -> ZR where Z = X Y")
   METH	(expr,		"M.expr(XR, N) -> ZR where Z = X^N mod M.m")
-  METH	(mexpr,		"\
-M.mexpr([(XR0, N0), (XR1, N1), ...]) = ZR where Z = X0^N0 X1^N1 ... mod M.m\n\
-\t(the list may be flattened if this more convenient.)")
+  METH	(mexpr,		"M.mexpr([(XR0, N0), (XR1, N1), ...]) = ZR "
+					"where Z = X0^N0 X1^N1 ... mod M.m\n"
+		    "\t(the list may be flattened if this more convenient.)")
   METH	(reduce,	"M.reduce(XR) -> X")
   METH	(ext,		"M.ext(XR) -> X")
   METH	(exp,		"M.exp(X, N) -> X^N mod M.m")
-  METH	(mexp,		"\
-M.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 ... mod M.m\n\
-\t(the list may be flattened if this more convenient.)")
+  METH	(mexp,		"M.mexp([(X0, N0), (X1, N1), ...]) = "
+						  "X0^N0 X1^N1 ... mod M.m\n"
+		    "\t(the list may be flattened if this more convenient.)")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpmont_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMont",				/* @tp_name@ */
   sizeof(mpmont_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1375,7 +1390,7 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"MPMont(N): a Montgomery reduction context.",
+  "MPMont(N): a Montgomery reduction context.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1383,9 +1398,9 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mpmont_pymethods,			/* @tp_methods@ */
+  PYMETHODS(mpmont),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mpmont_pygetset,			/* @tp_getset@ */
+  PYGETSET(mpmont),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1400,6 +1415,8 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
 
 /*----- Barrett reduction -------------------------------------------------*/
 
+static PyTypeObject *mpbarrett_pytype;
+
 typedef struct mpbarrett_pyobj {
   PyObject_HEAD
   mpbarrett mb;
@@ -1471,26 +1488,26 @@ end:
 static PyObject *mbget_m(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(MPBARRETT_PY(me)->m))); }
 
-static PyGetSetDef mpbarrett_pygetset[] = {
+static const PyGetSetDef mpbarrett_pygetset[] = {
 #define GETSETNAME(op, name) mb##op##_##name
   GET	(m,		"B.m -> modulus for reduction")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef mpbarrett_pymethods[] = {
+static const PyMethodDef mpbarrett_pymethods[] = {
 #define METHNAME(name) mbmeth_##name
   METH	(reduce,	"B.reduce(X) -> X mod B.m")
   METH	(exp,		"B.exp(X, N) -> X^N mod B.m")
-  METH	(mexp,		"\
-B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 ... mod B.m\n\
-\t(the list may be flattened if this more convenient.)")
+  METH	(mexp,		"B.mexp([(X0, N0), (X1, N1), ...]) = "
+						  "X0^N0 X1^N1 ... mod B.m\n"
+		    "\t(the list may be flattened if this more convenient.)")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpbarrett_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPBarrett",				/* @tp_name@ */
   sizeof(mpbarrett_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1514,7 +1531,7 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"MPBarrett(N): a Barrett reduction context.",
+  "MPBarrett(N): a Barrett reduction context.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1522,9 +1539,9 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mpbarrett_pymethods,			/* @tp_methods@ */
+  PYMETHODS(mpbarrett),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mpbarrett_pygetset,			/* @tp_getset@ */
+  PYGETSET(mpbarrett),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1539,6 +1556,8 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
 
 /*----- Nice prime reduction ----------------------------------------------*/
 
+static PyTypeObject *mpreduce_pytype;
+
 typedef struct mpreduce_pyobj {
   PyObject_HEAD
   mpreduce mr;
@@ -1602,14 +1621,14 @@ end:
 static PyObject *mrget_m(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(MPREDUCE_PY(me)->p))); }
 
-static PyGetSetDef mpreduce_pygetset[] = {
+static const PyGetSetDef mpreduce_pygetset[] = {
 #define GETSETNAME(op, name) mr##op##_##name
   GET	(m,		"R.m -> modulus for reduction")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef mpreduce_pymethods[] = {
+static const const PyMethodDef mpreduce_pymethods[] = {
 #define METHNAME(name) mrmeth_##name
   METH	(reduce,	"R.reduce(X) -> X mod B.m")
   METH	(exp,		"R.exp(X, N) -> X^N mod B.m")
@@ -1617,8 +1636,8 @@ static PyMethodDef mpreduce_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpreduce_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPReduce",				/* @tp_name@ */
   sizeof(mpreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1642,7 +1661,7 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"MPReduce(N): a reduction context for reduction modulo Solinas primes.",
+  "MPReduce(N): a reduction context for reduction modulo Solinas primes.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1650,9 +1669,9 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mpreduce_pymethods,			/* @tp_methods@ */
+  PYMETHODS(mpreduce),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mpreduce_pygetset,			/* @tp_getset@ */
+  PYGETSET(mpreduce),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1667,6 +1686,8 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
 
 /*----- Chinese Remainder Theorem solution --------------------------------*/
 
+static PyTypeObject *mpcrt_pytype;
+
 typedef struct mpcrt_pyobj {
   PyObject_HEAD
   mpcrt c;
@@ -1683,7 +1704,7 @@ static PyObject *mcmeth_solve(PyObject *me, PyObject *arg)
   Py_ssize_t i = 0, n = c->k;
 
   Py_INCREF(me);
-  if (PyTuple_Size(arg) == n)
+  if (PyTuple_GET_SIZE(arg) == n)
     q = arg;
   else if (!PyArg_ParseTuple(arg, "O:solve", &q))
     goto end;
@@ -1727,7 +1748,7 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   mpmul mm;
   mpcrt_pyobj *c = 0;
 
-  if (PyTuple_Size(arg) > 1)
+  if (PyTuple_GET_SIZE(arg) > 1)
     q = arg;
   else if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", KWLIST, &q))
     goto end;
@@ -1780,11 +1801,11 @@ static PyObject *mcget_moduli(PyObject *me, void *hunoz)
 
   if ((q = PyList_New(c->k)) == 0) return (0);
   for (i = 0; i < c->k; i++)
-    PyList_SetItem(q, i, mp_pywrap(c->v[i].m));
+    PyList_SET_ITEM(q, i, mp_pywrap(c->v[i].m));
   return (q);
 }
 
-static PyGetSetDef mpcrt_pygetset[] = {
+static const PyGetSetDef mpcrt_pygetset[] = {
 #define GETSETNAME(op, name) mc##op##_##name
   GET	(product,	"C.product -> product of moduli")
   GET	(moduli,	"C.moduli -> list of individual moduli")
@@ -1792,15 +1813,15 @@ static PyGetSetDef mpcrt_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef mpcrt_pymethods[] = {
+static const PyMethodDef mpcrt_pymethods[] = {
 #define METHNAME(name) mcmeth_##name
   METH	(solve,		"C.solve([R0, R1]) -> X mod C.product")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpcrt_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPCRT",				/* @tp_name@ */
   sizeof(mpcrt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1824,7 +1845,7 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"MPCRT(SEQ): a context for solving Chinese Remainder Theorem problems.",
+  "MPCRT(SEQ): a context for solving Chinese Remainder Theorem problems.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1832,9 +1853,9 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  mpcrt_pymethods,			/* @tp_methods@ */
+  PYMETHODS(mpcrt),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  mpcrt_pygetset,			/* @tp_getset@ */
+  PYGETSET(mpcrt),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1892,7 +1913,7 @@ static PyObject *gf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   if (!good_radix_p(radix, 1)) VALERR("radix out of range");
   if ((z = mp_frompyobject(x, radix)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf",
-		 x->ob_type->tp_name);
+		 Py_TYPE(x)->tp_name);
     goto end;
   }
   if (MP_NEGP(z)) {
@@ -1936,11 +1957,8 @@ end:
   return (rc);
 }
 
-static PyObject *gfmeth_sqr(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":sqr")) return (0);
-  return (gf_pywrap(gf_sqr(MP_NEW, MP_X(me))));
-}
+static PyObject *gfmeth_sqr(PyObject *me)
+  { return (gf_pywrap(gf_sqr(MP_NEW, MP_X(me)))); }
 
 static PyObject *gfmeth_gcd(PyObject *me, PyObject *arg)
 {
@@ -1984,16 +2002,40 @@ end:
   return (z);
 }
 
-static PyObject *gfmeth_irreduciblep(PyObject *me, PyObject *arg)
+static PyObject *gfmeth_fromstring(PyObject *me,
+				   PyObject *arg, PyObject *kw)
 {
-  if (!PyArg_ParseTuple(arg, ":irreduciblep")) return (0);
-  return getbool(gf_irreduciblep(MP_X(me)));
+  int r = 0;
+  char *p;
+  Py_ssize_t len;
+  PyObject *z = 0;
+  mp *zz;
+  mptext_stringctx sc;
+  static const char *const kwlist[] = { "x", "radix", 0 };
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|i:fromstring", KWLIST,
+				   &p, &len, &r))
+    goto end;
+  if (!good_radix_p(r, 1)) VALERR("bad radix");
+  sc.buf = p; sc.lim = p + len;
+  if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 ||
+      MP_NEGP(zz)) {
+    if (zz) MP_DROP(zz);
+    VALERR("bad binary polynomial");
+  }
+  z = Py_BuildValue("(Ns#)", gf_pywrap(zz),
+		    sc.buf, (Py_ssize_t)(sc.lim - sc.buf));
+end:
+  return (z);
 }
 
+static PyObject *gfmeth_irreduciblep(PyObject *me)
+  { return getbool(gf_irreduciblep(MP_X(me))); }
+
 static PyObject *gfget_degree(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(mp_bits(MP_X(me)) - 1)); }
 
-static PyGetSetDef gf_pygetset[] = {
+static const PyGetSetDef gf_pygetset[] = {
 #define GETSETNAME(op, name) gf##op##_##name
   GET	(degree,	"X.degree -> polynomial degree of X")
 #undef GETSETNAME
@@ -2004,32 +2046,38 @@ static PyGetSetDef gf_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef gf_pymethods[] = {
+static const PyMethodDef gf_pymethods[] = {
 #define METHNAME(func) gfmeth_##func
   METH	(setbit,	"X.setbit(N) -> X with bit N set")
   METH	(clearbit,	"X.clearbit(N) -> X with bit N clear")
   METH	(testbit,	"X.testbit(N) -> true/false if bit N set/clear in X")
-  METH	(sqr,		"X.sqr() -> X^2")
+  NAMETH(sqr,		"X.sqr() -> X^2")
   METH	(gcd,		"X.gcd(Y) -> gcd(X, Y)")
-  METH	(gcdx,
-	 "X.gcdx(Y) -> (gcd(X, Y), U, V) with X U + Y V = gcd(X, Y)")
+  METH	(gcdx,   "X.gcdx(Y) -> (gcd(X, Y), U, V) with X U + Y V = gcd(X, Y)")
   METH	(modinv,	"X.modinv(Y) -> multiplicative inverse of Y mod X")
-  METH	(irreduciblep,	"X.irreduciblep() -> true/false")
+  NAMETH(irreduciblep,	"X.irreduciblep() -> true/false")
+  KWSMTH(fromstring,	"fromstring(STR, [radix = 0]) -> (X, REST)\n"
+    "  Parse STR as a binary polynomial, according to RADIX.  If RADIX is\n"
+    "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
+    "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH	(loadl,		"loadl(STR) -> X: read little-endian bytes")
+  SMTH	(loadb,		"loadb(STR) -> X: read big-endian bytes")
+  SMTH	(frombuf,	"frombuf(STR) -> (X, REST): read buffer format")
 #undef METHNAME
 #define METHNAME(func) mpmeth_##func
   KWMETH(tostring,	"X.tostring([radix = 10]) -> STR")
   KWMETH(storel,	"X.storel([len = -1]) -> little-endian bytes")
   KWMETH(storeb,	"X.storeb([len = -1]) -> big-endian bytes")
-  KWMETH(storel2c,
-	 "X.storel2c([len = -1]) -> little-endian bytes, two's complement")
-  KWMETH(storeb2c,
-	 "X.storeb2c([len = -1]) -> big-endian bytes, two's complement")
-  METH	(tobuf,		"X.tobuf() -> buffer format")
+  KWMETH(storel2c,	"X.storel2c([len = -1]) -> "
+				     "little-endian bytes, two's complement")
+  KWMETH(storeb2c,	"X.storeb2c([len = -1]) -> "
+					"big-endian bytes, two's complement")
+  NAMETH(tobuf,		"X.tobuf() -> buffer format")
 #undef METHNAME
   { 0 }
 };
 
-static PyNumberMethods gf_pynumber = {
+static const PyNumberMethods gf_pynumber = {
   gf_pyadd,				/* @nb_add@ */
   gf_pysub,				/* @nb_subtract@ */
   gf_pymul,				/* @nb_multiply@ */
@@ -2072,8 +2120,8 @@ static PyNumberMethods gf_pynumber = {
   0,					/* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject gf_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gf_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GF",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2084,7 +2132,7 @@ static PyTypeObject gf_pytype_skel = {
   0,					/* @tp_setattr@ */
   0,					/* @tp_compare@ */
   gf_pyrepr,				/* @tp_repr@ */
-  &gf_pynumber,				/* @tp_as_number@ */
+  PYNUMBER(gf),				/* @tp_as_number@ */
   0,					/* @tp_as_sequence@ */
   0,					/* @tp_as_mapping@ */
   mp_pyhash,				/* @tp_hash@ */
@@ -2098,21 +2146,21 @@ static PyTypeObject gf_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Binary polynomials.  Support almost all the standard arithmetic\n\
-operations.\n\
-\n\
-Constructor GF(X, [radix = R]) attempts to convert X to a `GF'.  If\n\
-X is a string, it's read in radix-R form, or we look for a prefix\n\
-if R = 0.  Other acceptable things are field elements, elliptic curve\n\
-points, group elements, Python `int' and `long' objects, and anything\n\
-with an integer conversion.\n\
-\n\
-The name is hopelessly wrong from a technical point of view, but\n\
-but it's much easier to type than `p2' or `c2' or whatever.\n\
-\n\
-Notes:\n\
-\n\
-  * Use `//' for Euclidean division: `/' gives exact rational division.",
+  "Binary polynomials.  Support almost all the standard arithmetic\n"
+  "operations.\n"
+  "\n"
+  "Constructor GF(X, [radix = R]) attempts to convert X to a `GF'.  If\n"
+  "X is a string, it's read in radix-R form, or we look for a prefix\n"
+  "if R = 0.  Other acceptable things are field elements, elliptic curve\n"
+  "points, group elements, Python `int' and `long' objects, and anything\n"
+  "with an integer conversion.\n"
+  "\n"
+  "The name is hopelessly wrong from a technical point of view, but\n"
+  "but it's much easier to type than `p2' or `c2' or whatever.\n"
+  "\n"
+  "Notes:\n"
+  "\n"
+  "  * Use `//' for Euclidean division: `/' gives exact rational division.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2120,9 +2168,9 @@ Notes:\n\
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gf_pymethods,				/* @tp_methods@ */
+  PYMETHODS(gf),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gf_pygetset,				/* @tp_getset@ */
+  PYGETSET(gf),				/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2135,35 +2183,10 @@ Notes:\n\
   0					/* @tp_is_gc@ */
 };
 
-static PyObject *meth__GF_fromstring(PyObject *me,
-				    PyObject *arg, PyObject *kw)
-{
-  int r = 0;
-  char *p;
-  Py_ssize_t len;
-  PyObject *z = 0;
-  mp *zz;
-  mptext_stringctx sc;
-  static const char *const kwlist[] = { "class", "x", "radix", 0 };
-
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring",
-				   KWLIST, &me, &p, &len, &r))
-    goto end;
-  if (!good_radix_p(r, 1)) VALERR("bad radix");
-  sc.buf = p; sc.lim = p + len;
-  if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 ||
-      MP_NEGP(zz)) {
-    if (zz) MP_DROP(zz);
-    VALERR("bad binary polynomial");
-  }
-  z = Py_BuildValue("(Ns#)", gf_pywrap(zz),
-		    sc.buf, (Py_ssize_t)(sc.lim - sc.buf));
-end:
-  return (z);
-}
-
 /*----- Sparse poly reduction ---------------------------------------------*/
 
+static PyTypeObject *gfreduce_pytype;
+
 typedef struct gfreduce_pyobj {
   PyObject_HEAD
   gfreduce mr;
@@ -2279,18 +2302,18 @@ end:
 static PyObject *grget_m(PyObject *me, void *hunoz)
   { return (gf_pywrap(MP_COPY(GFREDUCE_PY(me)->p))); }
 
-static PyGetSetDef gfreduce_pygetset[] = {
+static const PyGetSetDef gfreduce_pygetset[] = {
 #define GETSETNAME(op, name) gr##op##_##name
   GET	(m,		"R.m -> reduction polynomial")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef gfreduce_pymethods[] = {
+static const PyMethodDef gfreduce_pymethods[] = {
 #define METHNAME(name) grmeth_##name
   METH	(reduce,	"R.reduce(X) -> X mod B.m")
   METH	(trace,	       "R.trace(X) -> Tr(X) = x + x^2 + ... + x^{2^{m - 1}}")
-  METH	(halftrace,   "R.halftrace(X) -> x + x^{2^2} + ... + x^{2^{m - 1}}")
+  METH	(halftrace,    "R.halftrace(X) -> x + x^{2^2} + ... + x^{2^{m - 1}}")
   METH	(sqrt,		"R.sqrt(X) -> Y where Y^2 = X mod R")
   METH	(quadsolve,	"R.quadsolve(X) -> Y where Y^2 + Y = X mod R")
   METH	(exp,		"R.exp(X, N) -> X^N mod B.m")
@@ -2298,8 +2321,8 @@ static PyMethodDef gfreduce_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gfreduce_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFReduce",				/* @tp_name@ */
   sizeof(gfreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2323,7 +2346,7 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"GFReduce(N): a context for reduction modulo sparse polynomials.",
+  "GFReduce(N): a context for reduction modulo sparse polynomials.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2331,9 +2354,9 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gfreduce_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gfreduce),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gfreduce_pygetset,			/* @tp_getset@ */
+  PYGETSET(gfreduce),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2348,14 +2371,14 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
 
 /*----- Normal/poly transformation ----------------------------------------*/
 
+static PyTypeObject *gfn_pytype;
+
 typedef struct gfn_pyobj {
   PyObject_HEAD
   mp *p;
   gfn ntop, pton;
 } gfn_pyobj;
 
-static PyTypeObject *gfn_pytype, gfn_pytype_skel;
-
 #define GFN_P(o) (((gfn_pyobj *)(o))->p)
 #define GFN_PTON(o) (&((gfn_pyobj *)(o))->pton)
 #define GFN_NTOP(o) (&((gfn_pyobj *)(o))->ntop)
@@ -2420,7 +2443,7 @@ static void gfn_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static PyGetSetDef gfn_pygetset[] = {
+static const PyGetSetDef gfn_pygetset[] = {
 #define GETSETNAME(op, name) gfn##op##_##name
   GET	(p,		"X.p -> polynomial basis, as polynomial")
   GET	(beta,		"X.beta -> normal basis element, in poly form")
@@ -2428,7 +2451,7 @@ static PyGetSetDef gfn_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef gfn_pymethods[] = {
+static const PyMethodDef gfn_pymethods[] = {
 #define METHNAME(name) gfnmeth_##name
   METH	(pton,		"X.pton(A) -> normal-basis representation of A")
   METH	(ntop,		"X.ntop(A) -> polynomial-basis representation of A")
@@ -2436,8 +2459,8 @@ static PyMethodDef gfn_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gfn_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gfn_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFN",				/* @tp_name@ */
   sizeof(gfn_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2461,8 +2484,8 @@ static PyTypeObject gfn_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"GFN(P, BETA): an object for transforming elements of binary fields\n\
-  between polynomial and normal basis representations.",
+  "GFN(P, BETA): an object for transforming elements of binary fields\n"
+  "  between polynomial and normal basis representations.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2470,9 +2493,9 @@ static PyTypeObject gfn_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gfn_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gfn),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gfn_pygetset,				/* @tp_getset@ */
+  PYGETSET(gfn),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2487,41 +2510,8 @@ static PyTypeObject gfn_pytype_skel = {
 
 /*----- Glue --------------------------------------------------------------*/
 
-static PyMethodDef methods[] = {
-#define METHNAME(func) meth_##func
-  KWMETH(_MP_fromstring,	"\
-fromstring(STR, [radix = 0]) -> (X, REST)\n\
-\n\
-Parse STR as a large integer, according to radix.  If radix is zero,\n\
-read a prefix from STR to decide radix: allow `0' for octal, `0x' for hex\n\
-or `R_' for other radix R.")
-  KWMETH(_GF_fromstring,	"\
-fromstring(STR, [radix = 0]) -> (X, REST)\n\
-\n\
-Parse STR as a binary polynomial, according to radix.  If radix is zero,\n\
-read a prefix from STR to decide radix: allow `0' for octal, `0x' for hex\n\
-or `R_' for other radix R.")
-  METH	(_MP_factorial,		"\
-factorial(I) -> I!: compute factorial")
-  METH	(_MP_fibonacci,		"\
-fibonacci(I) -> F(I): compute Fibonacci number")
-  METH	(_MP_loadl,		"\
-loadl(STR) -> X: read little-endian bytes")
-  METH	(_MP_loadb,		"\
-loadb(STR) -> X: read big-endian bytes")
-  METH	(_MP_loadl2c,		"\
-loadl2c(STR) -> X: read little-endian bytes, two's complement")
-  METH	(_MP_loadb2c,		"\
-loadb2c(STR) -> X: read big-endian bytes, two's complement")
-  METH	(_MP_frombuf,		"\
-frombuf(STR) -> (X, REST): read buffer format")
-  METH	(_GF_loadl,		"\
-loadl(STR) -> X: read little-endian bytes")
-  METH	(_GF_loadb,		"\
-loadb(STR) -> X: read big-endian bytes")
-  METH	(_GF_frombuf,		"\
-frombuf(STR) -> (X, REST): read buffer format")
-#undef METHNAME
+static const struct nameval consts[] = {
+  CONST(MPW_MAX),
   { 0 }
 };
 
@@ -2536,7 +2526,6 @@ void mp_pyinit(void)
   INITTYPE(mpcrt, root);
   INITTYPE(gfreduce, root);
   INITTYPE(gfn, root);
-  addmethods(methods);
 }
 
 void mp_pyinsert(PyObject *mod)
@@ -2550,6 +2539,7 @@ void mp_pyinsert(PyObject *mod)
   INSERT("GF", gf_pytype);
   INSERT("GFReduce", gfreduce_pytype);
   INSERT("GFN", gfn_pytype);
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/