X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/d0d9458708e431e88d60a9073da384a9d4baa3dd..refs/heads/mdw/python3:/mp.c

diff --git a/mp.c b/mp.c
index 88ee738..3549ccb 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,21 @@ mp *mp_frompylong(PyObject *obj)
   mp *x;
   mpw *p;
 
-  sz = l->ob_size;
+#ifdef PY3
+  int ov;
+  long j = PyLong_AsLongAndOverflow(obj, &ov);
+  if (!ov) return mp_fromlong(MP_NEW, j);
+#endif
+
+  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 +89,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 +117,17 @@ 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;
+    if (sc.buf + 2 < sc.lim && sc.buf[0] == '0' &&
+	(radix == 16 ? (sc.buf[1] == 'x' || sc.buf[1] == 'X') :
+	 radix ==  8 ? (sc.buf[1] == 'o' || sc.buf[1] == 'O') :
+	 radix ==  2 ? (sc.buf[1] == 'b' || sc.buf[1] == 'B') :
+	 0))
+      sc.buf += 2;
     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 +149,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 +158,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);
 }
 
@@ -182,7 +202,7 @@ end:
   return (rc);
 }
 
-/*----- Python interface --------------------------------------------------*/
+/*----- Arbitrary-precision integers --------------------------------------*/
 
 static void mp_pydealloc(PyObject *o)
 {
@@ -191,7 +211,7 @@ static void mp_pydealloc(PyObject *o)
 }
 
 static PyObject *mp_pyrepr(PyObject *o)
-  { return mp_topystring(MP_X(o), 10, "MP(", 0, "L)"); }
+  { return mp_topystring(MP_X(o), 10, "MP(", 0, ")"); }
 
 static PyObject *mp_pystr(PyObject *o)
   { return mp_topystring(MP_X(o), 10, 0, 0, 0); }
@@ -201,7 +221,7 @@ mp *tomp(PyObject *o)
   PyObject *l;
   mp *x;
 
-  if (!o)
+  if (!o || PyFloat_Check(o))
     return (0);
   else if (MP_PYCHECK(o) || GF_PYCHECK(o))
     return (MP_COPY(MP_X(o)));
@@ -211,6 +231,7 @@ mp *tomp(PyObject *o)
     return (MP_COPY(PFILT_F(o)->m));
   else if (ECPT_PYCHECK(o)) {
     ec p = EC_INIT;
+    if (EC_ATINF(ECPT_P(o))) return (0);
     getecptout(&p, o);
     x = MP_COPY(p.x);
     EC_DESTROY(&p);
@@ -219,8 +240,11 @@ mp *tomp(PyObject *o)
     if ((x = G_TOINT(GE_G(o), MP_NEW, GE_X(o))) == 0)
       return (0);
     return (x);
-  } else if (PyInt_Check(o))
+  }
+#ifdef PY2
+  else if (PyInt_Check(o))
     return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
   else if ((l = PyNumber_Long(o)) != 0) {
     x = mp_frompylong(l);
     Py_DECREF(l);
@@ -237,7 +261,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);
 }
@@ -256,7 +280,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);
 }
@@ -269,26 +293,29 @@ int convgf(PyObject *o, void *p)
   return (1);
 }
 
-static mp *implicitmp(PyObject *o)
+mp *implicitmp(PyObject *o)
 {
-  if (!o ||
-      GF_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  PyObject *l;
+
+  if (!o || GF_PYCHECK(o) || FE_PYCHECK(o)) return (0);
+  else if (MP_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  else if (PFILT_PYCHECK(o)) return (MP_COPY(PFILT_F(o)->m));
+#ifdef PY2
+  else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+  else if ((l = PyNumber_Index(o)) != 0) {
+#ifdef PY2
+    if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+    if (PyLong_Check(o)) return (mp_frompylong(o));
+  }
+  PyErr_Clear(); return (0);
 }
 
-static mp *implicitgf(PyObject *o)
+mp *implicitgf(PyObject *o)
 {
-  if (!o ||
-      MP_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  if (GF_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  return (0);
 }
 
 static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
@@ -313,6 +340,26 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
   return (0);
 }
 
+#define FPBINOP(name, pyop)						\
+  static PyObject *mp_py##name(PyObject *x, PyObject *y) {		\
+    mp *xx, *yy, *zz;							\
+    PyObject *l, *rc;							\
+    if (PyFloat_Check(x)) {						\
+      l = mp_topylong(MP_X(y)); rc = PyNumber_##pyop(x, l);		\
+      Py_DECREF(l); return (rc);					\
+    } else if (PyFloat_Check(y)) {					\
+      l = mp_topylong(MP_X(x)); rc = PyNumber_##pyop(l, y);		\
+      Py_DECREF(l); return (rc);					\
+    }									\
+    if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL;			\
+    zz = mp_##name(MP_NEW, xx, yy);					\
+    MP_DROP(xx); MP_DROP(yy);						\
+    return (mp_pywrap(zz));						\
+  }
+FPBINOP(add, Add)
+FPBINOP(sub, Subtract)
+FPBINOP(mul, Multiply)
+
 #define gf_and mp_and
 #define gf_or mp_or
 #define gf_xor mp_xor
@@ -324,9 +371,6 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
     MP_DROP(xx); MP_DROP(yy);						\
     return (pre##_pywrap(zz));						\
   }
-BINOP(mp, add)
-BINOP(mp, sub)
-BINOP(mp, mul)
 BINOP(mp, and2c)
 BINOP(mp, or2c)
 BINOP(mp, xor2c)
@@ -358,25 +402,24 @@ UNOP(mp, not2c)
 static PyObject *mp_pyid(PyObject *x) { RETURN_OBJ(x); }
 
 #define gf_lsr mp_lsr
-#define SHIFTOP(pre, name, rname)					\
+#define SHIFTOP(pre, PRE, name, rname)					\
   static PyObject *pre##_py##name(PyObject *x, PyObject *y) {		\
-    mp *xx, *yy;							\
+    PyObject *yix = 0;							\
     PyObject *z = 0;							\
     long n;								\
-    if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL;			\
-    if (mp_tolong_checked(yy, &n, 1)) goto end;				\
-    if (n < 0)								\
-      z = pre##_pywrap(mp_##rname(MP_NEW, xx, -n));			\
-    else								\
-      z = pre##_pywrap(mp_##name(MP_NEW, xx, n));			\
-  end:									\
-    MP_DROP(xx); MP_DROP(yy);						\
+    if (!PRE##_PYCHECK(x)) RETURN_NOTIMPL;				\
+    if (GF_PYCHECK(y) || FE_PYCHECK(y)) RETURN_NOTIMPL;			\
+    yix = PyNumber_Index(y); if (!yix) { PyErr_Clear(); RETURN_NOTIMPL; } \
+    n = PyInt_AsLong(yix); Py_DECREF(yix);				\
+    if (n == -1 && PyErr_Occurred())  { PyErr_Clear(); RETURN_NOTIMPL; } \
+    if (n < 0) z = pre##_pywrap(mp_##rname(MP_NEW, MP_X(x), -n));	\
+    else z = pre##_pywrap(mp_##name(MP_NEW, MP_X(x), n));		\
     return (z);								\
   }
-SHIFTOP(mp, lsl2c, lsr2c)
-SHIFTOP(mp, lsr2c, lsl2c)
-SHIFTOP(gf, lsl, lsr)
-SHIFTOP(gf, lsr, lsl)
+SHIFTOP(mp, MP, lsl2c, lsr2c)
+SHIFTOP(mp, MP, lsr2c, lsl2c)
+SHIFTOP(gf, GF, lsl, lsr)
+SHIFTOP(gf, GF, lsr, lsl)
 #undef SHIFTOP
 
 #define DIVOP(pre, name, qq, rr, gather)				\
@@ -430,7 +473,7 @@ static PyObject *mp_pyexp(PyObject *x, PyObject *y, PyObject *z)
   PyObject *rc = 0;
 
   if ((xx = implicitmp(x)) == 0 || (yy = implicitmp(y)) == 0 ||
-      (z && z != Py_None && (zz = tomp(z)) == 0)) {
+      (z && z != Py_None && (zz = implicitmp(z)) == 0)) {
     mp_drop(xx); mp_drop(yy); mp_drop(zz);
     RETURN_NOTIMPL;
   }
@@ -476,7 +519,9 @@ static mp *gf_modinv_checked(mp *d, mp *x, mp *p)
 #define BASEOP(name, radix, pre)					\
   static PyObject *mp_py##name(PyObject *x)				\
     { return mp_topystring(MP_X(x), radix, 0, pre, 0); }
+#ifdef PY2
 BASEOP(oct, 8, "0");
+#endif
 BASEOP(hex, 16, "0x");
 #undef BASEOP
 
@@ -488,8 +533,10 @@ static PyObject *mp_pyint(PyObject *x)
   if (!mp_tolong_checked(MP_X(x), &l, 0)) return (PyInt_FromLong(l));
   else return mp_topylong(MP_X(x));
 }
+#ifdef PY2
 static PyObject *mp_pylong(PyObject *x)
   { return (mp_topylong(MP_X(x))); }
+#endif
 static PyObject *mp_pyfloat(PyObject *x)
 {
   PyObject *l = mp_topylong(MP_X(x));
@@ -498,6 +545,7 @@ static PyObject *mp_pyfloat(PyObject *x)
   return (PyFloat_FromDouble(f));
 }
 
+#ifdef PY2
 #define COERCE(pre, PRE)						\
   static int pre##_pycoerce(PyObject **x, PyObject **y)			\
   {									\
@@ -507,7 +555,7 @@ static PyObject *mp_pyfloat(PyObject *x)
       Py_INCREF(*x); Py_INCREF(*y);					\
       return (0);							\
     }									\
-    if ((z = tomp(*y)) != 0) {						\
+    if ((z = implicit##pre(*y)) != 0) {					\
       Py_INCREF(*x);							\
       *y = pre##_pywrap(z);						\
       return (0);							\
@@ -517,9 +565,26 @@ static PyObject *mp_pyfloat(PyObject *x)
 COERCE(mp, MP)
 COERCE(gf, GF)
 #undef COERCE
+#endif
+
+static PyObject *mp_pyrichcompare(PyObject *x, PyObject *y, int op)
+{
+  mp *xx, *yy;
+  PyObject *l, *rc;
+  if (PyFloat_Check(y)) {
+    l = mp_topylong(MP_X(x)); rc = PyObject_RichCompare(l, y, op);
+    Py_DECREF(l); return (rc);
+  }
+  if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL;
+  rc = enrich_compare(op, mp_cmp(xx, yy));
+  MP_DROP(xx); MP_DROP(yy);
+  return (rc);
+}
 
+#ifdef PY2
 static int mp_pycompare(PyObject *x, PyObject *y)
   { return mp_cmp(MP_X(x), MP_X(y)); }
+#endif
 
 static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
@@ -527,15 +592,15 @@ static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   mp *z;
   mp_pyobj *zz = 0;
   int radix = 0;
-  char *kwlist[] = { "x", "radix", 0 };
+  static const char *const kwlist[] = { "x", "radix", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:new", kwlist, &x, &radix))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:new", KWLIST, &x, &radix))
     goto end;
   if (MP_PYCHECK(x)) RETURN_OBJ(x);
   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);
@@ -544,13 +609,31 @@ end:
   return ((PyObject *)zz);
 }
 
-static long mp_pyhash(PyObject *me)
+#define IMPLICIT(pre)							\
+  static PyObject *pre##meth__implicit(PyObject *me, PyObject *arg)	\
+  {									\
+    PyObject *x, *rc = 0;						\
+    mp *y = MP_NEW;							\
+    if (!PyArg_ParseTuple(arg, "O:_implicit", &x)) goto end;		\
+    y = implicit##pre(x);						\
+    if (!y) TYERR("can't convert implicitly to " #pre);			\
+    rc = pre##_pywrap(y);						\
+  end:									\
+    return (rc);							\
+  }
+IMPLICIT(mp)
+IMPLICIT(gf)
+#undef IMPLICIT
+
+Py_hash_t mphash(mp *x)
 {
-  long h;
-  PyObject *l = mp_topylong(MP_X(me)); h = PyObject_Hash(l);
+  PyObject *l = mp_topylong(x);
+  Py_hash_t h = PyObject_Hash(l);
   Py_DECREF(l); return (h);
 }
 
+static Py_hash_t mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
+
 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
   mp *y = 0;
@@ -590,25 +673,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:
@@ -659,8 +737,8 @@ end:
 static PyObject *mpmeth_tostring(PyObject *me, PyObject *arg, PyObject *kw)
 {
   int radix = 10;
-  char *kwlist[] = { "radix", 0 };
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:tostring", kwlist, &radix))
+  static const char *const kwlist[] = { "radix", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:tostring", KWLIST, &radix))
     goto end;
   if (!good_radix_p(radix, 0)) VALERR("bad radix");
   return (mp_topystring(MP_X(me), radix, 0, 0, 0));
@@ -700,18 +778,18 @@ end:
 				 PyObject *arg, PyObject *kw)		\
   {									\
     long len = -1;							\
-    char *kwlist[] = { "len", 0 };					\
+    static const char *const kwlist[] = { "len", 0 };			\
     PyObject *rc = 0;							\
 									\
     if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name,		\
-				    kwlist, &len))			\
+				    KWLIST, &len))			\
       goto end;								\
     if (len < 0) {							\
       len = mp_octets##c(MP_X(me));					\
       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);							\
   }
@@ -721,58 +799,113 @@ 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);
 }
 
 static PyObject *mpmeth_primep(PyObject *me, PyObject *arg, PyObject *kw)
 {
   grand *r = &rand_global;
-  char *kwlist[] = { "rng", 0 };
+  static const char *const kwlist[] = { "rng", 0 };
   PyObject *rc = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&", kwlist, convgrand, &r))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&", KWLIST, convgrand, &r))
     goto end;
   rc = getbool(pgen_primep(MP_X(me), r));
 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)))); }
 
@@ -782,7 +915,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")
@@ -791,40 +924,56 @@ 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	(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")
-  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")
+  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")
+  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	(_implicit,	0)
+  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@ */
+#ifdef PY2
   0,					/* @nb_divide@ */
+#endif
   mp_pymod,				/* @nb_remainder@ */
   mp_pydivmod,				/* @nb_divmod@ */
   mp_pyexp,				/* @nb_power@ */
@@ -838,17 +987,23 @@ static PyNumberMethods mp_pynumber = {
   mp_pyand2c,				/* @nb_and@ */
   mp_pyxor2c,				/* @nb_xor@ */
   mp_pyor2c,				/* @nb_or@ */
+#ifdef PY2
   mp_pycoerce,				/* @nb_coerce@ */
+#endif
   mp_pyint,				/* @nb_int@ */
-  mp_pylong,				/* @nb_long@ */
+  PY23(mp_pylong, 0),			/* @nb_long@ */
   mp_pyfloat,				/* @nb_float@ */
+#ifdef PY2
   mp_pyoct,				/* @nb_oct@ */
   mp_pyhex,				/* @nb_hex@ */
+#endif
 
   0,					/* @nb_inplace_add@ */
   0,					/* @nb_inplace_subtract@ */
   0,					/* @nb_inplace_multiply@ */
+#ifdef PY2
   0,					/* @nb_inplace_divide@ */
+#endif
   0,					/* @nb_inplace_remainder@ */
   0,					/* @nb_inplace_power@ */
   0,					/* @nb_inplace_lshift@ */
@@ -861,10 +1016,12 @@ static PyNumberMethods mp_pynumber = {
   0,					/* @nb_true_divide@ */
   0,					/* @nb_inplace_floor_divide@ */
   0,					/* @nb_inplace_true_divide@ */
+
+  mp_pyint,				/* @nb_index@ */
 };
 
-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@ */
@@ -873,9 +1030,9 @@ static PyTypeObject mp_pytype_skel = {
   0,					/* @tp_print@ */
   0,					/* @tp_getattr@ */
   0,					/* @tp_setattr@ */
-  mp_pycompare,				/* @tp_compare@ */
+  PY23(mp_pycompare, 0),		/* @tp_compare@/@tp_as_async@ */
   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@ */
@@ -889,26 +1046,33 @@ 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.\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 ints and longs.\n\
-\n\
-Notes:\n\
-\n\
-  * Use `//' for division.  MPs don't have `/' 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 `" PY23("long", "int") "'.\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"
+  PY23(
+  "points, group elements, Python `int' and `long' objects, and anything\n"
+  "with an integer conversion.\n",
+  "points, group elements, Python `int' objects, and anything with an\n"
+  "integer conversion.\n")
+  "\n"
+  "Notes:\n"
+  "\n"
+  "  * Use `//' for integer division: `/' gives exact rational division.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
-  0,					/* @tp_richcompare@ */
+  mp_pyrichcompare,			/* @tp_richcompare@ */
   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@ */
@@ -921,67 +1085,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;
-  char *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;
@@ -1004,10 +1111,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);
@@ -1028,11 +1135,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;
@@ -1061,23 +1167,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@ */
@@ -1101,7 +1207,7 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"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@ */
@@ -1109,9 +1215,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@ */
@@ -1126,6 +1232,8 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
 
 /*----- Montgomery reduction ----------------------------------------------*/
 
+static PyTypeObject *mpmont_pytype;
+
 typedef struct mpmont_pyobj {
   PyObject_HEAD
   mpmont mm;
@@ -1224,7 +1332,7 @@ fail:
   return (-1);
 }
 
-static PyObject *mm_mexpr(PyObject *me, void *v, int n)
+static PyObject *mm_mexpr(PyObject *me, void *v, size_t n)
   { return mp_pywrap(mpmont_mexpr(MPMONT_PY(me), MP_NEW, v, n)); }
 
 static void mp_mexp_drop(void *p)
@@ -1264,7 +1372,7 @@ fail:
   return (-1);
 }
 
-static PyObject *mm_mexp(PyObject *me, void *v, int n)
+static PyObject *mm_mexp(PyObject *me, void *v, size_t n)
   { return mp_pywrap(mpmont_mexp(MPMONT_PY(me), MP_NEW, v, n)); }
 
 static PyObject *mmmeth_mexp(PyObject *me, PyObject *arg)
@@ -1294,10 +1402,10 @@ static void mpmont_pydealloc(PyObject *me)
 static PyObject *mpmont_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   mpmont_pyobj *mm = 0;
-  char *kwlist[] = { "m", 0 };
+  static const char *const kwlist[] = { "m", 0 };
   mp *xx = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx))
     goto end;
   if (!MP_POSP(xx) || !MP_ODDP(xx)) VALERR("m must be positive and odd");
   mm = (mpmont_pyobj *)ty->tp_alloc(ty, 0);
@@ -1316,7 +1424,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")
@@ -1325,26 +1433,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@ */
@@ -1368,7 +1476,7 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"A Montgomery reduction context.",
+  "MPMont(N): a Montgomery reduction context.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1376,9 +1484,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@ */
@@ -1393,6 +1501,8 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
 
 /*----- Barrett reduction -------------------------------------------------*/
 
+static PyTypeObject *mpbarrett_pytype;
+
 typedef struct mpbarrett_pyobj {
   PyObject_HEAD
   mpbarrett mb;
@@ -1417,7 +1527,7 @@ end:
   return (rc);
 }
 
-static PyObject *mb_mexp(PyObject *me, void *v, int n)
+static PyObject *mb_mexp(PyObject *me, void *v, size_t n)
   { return mp_pywrap(mpbarrett_mexp(MPBARRETT_PY(me), MP_NEW, v, n)); }
 
 static PyObject *mbmeth_mexp(PyObject *me, PyObject *arg)
@@ -1448,10 +1558,10 @@ static PyObject *mpbarrett_pynew(PyTypeObject *ty,
 				 PyObject *arg, PyObject *kw)
 {
   mpbarrett_pyobj *mb = 0;
-  char *kwlist[] = { "m", 0 };
+  static const char *const kwlist[] = { "m", 0 };
   mp *xx = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx))
     goto end;
   if (!MP_POSP(xx)) VALERR("m must be positive");
   mb = (mpbarrett_pyobj *)ty->tp_alloc(ty, 0);
@@ -1464,26 +1574,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@ */
@@ -1507,7 +1617,7 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"A Barrett reduction context.",
+  "MPBarrett(N): a Barrett reduction context.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1515,9 +1625,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@ */
@@ -1532,6 +1642,8 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
 
 /*----- Nice prime reduction ----------------------------------------------*/
 
+static PyTypeObject *mpreduce_pytype;
+
 typedef struct mpreduce_pyobj {
   PyObject_HEAD
   mpreduce mr;
@@ -1578,10 +1690,10 @@ static PyObject *mpreduce_pynew(PyTypeObject *ty,
 {
   mpreduce_pyobj *mr = 0;
   mpreduce r;
-  char *kwlist[] = { "m", 0 };
+  static const char *const kwlist[] = { "m", 0 };
   mp *xx = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx))
     goto end;
   if (!MP_POSP(xx)) VALERR("m must be positive");
   if (mpreduce_create(&r, xx)) VALERR("bad modulus (must be 2^k - ...)");
@@ -1595,14 +1707,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")
@@ -1610,8 +1722,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@ */
@@ -1635,7 +1747,7 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"A reduction context for reduction modulo primes of special form.",
+  "MPReduce(N): a reduction context for reduction modulo Solinas primes.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1643,9 +1755,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@ */
@@ -1660,6 +1772,8 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
 
 /*----- Chinese Remainder Theorem solution --------------------------------*/
 
+static PyTypeObject *mpcrt_pytype;
+
 typedef struct mpcrt_pyobj {
   PyObject_HEAD
   mpcrt c;
@@ -1670,35 +1784,35 @@ typedef struct mpcrt_pyobj {
 static PyObject *mcmeth_solve(PyObject *me, PyObject *arg)
 {
   mpcrt *c = MPCRT_PY(me);
-  PyObject *q = 0, *x, *z = 0;
+  PyObject *q = 0, *it, *x, *z = 0;
   mp *xx;
   mp **v = 0;
-  int i = 0, n = c->k;
+  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;
-  Py_INCREF(q);
-  if (!PySequence_Check(q)) TYERR("want a sequence of residues");
-  if (PySequence_Size(q) != n) VALERR("residue count mismatch");
-  v = xmalloc(n * sizeof(*v));
-  for (i = 0; i < n; i++) {
-    if ((x = PySequence_GetItem(q, i)) == 0) goto end;
+  v = xmalloc(n*sizeof(*v));
+  it = PyObject_GetIter(q); if (!it) goto end;
+  while (i < n) {
+    x = PyIter_Next(it);
+    if (!x) {
+      if (PyErr_Occurred()) goto end;
+      VALERR("residue count mismatch");
+    }
     xx = getmp(x); Py_DECREF(x); if (!xx) goto end;
-    v[i] = xx;
+    v[i++] = xx; xx = 0;
   }
+  x = PyIter_Next(it);
+  if (x) { Py_DECREF(x); VALERR("residue count mismatch"); }
+  else if (PyErr_Occurred()) goto end;
   z = mp_pywrap(mpcrt_solve(c, MP_NEW, v));
 end:
   if (v) {
-    n = i;
-    for (i = 0; i < n; i++)
-      MP_DROP(v[i]);
+    while (i--) MP_DROP(v[i]);
     xfree(v);
   }
-  Py_DECREF(me);
-  Py_XDECREF(q);
   return (z);
 }
 
@@ -1712,40 +1826,58 @@ static void mpcrt_pydealloc(PyObject *me)
 static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   mpcrt_mod *v = 0;
-  int n, i = 0;
-  char *kwlist[] = { "mv", 0 };
-  PyObject *q = 0, *x;
-  mp *xx;
+  Py_ssize_t n, i = 0, j;
+  static const char *const kwlist[] = { "mv", 0 };
+  PyObject *q, *it = 0, *x;
+  mp *xx = MP_NEW, *y = MP_NEW, *g = MP_NEW;
+  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))
+  else if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", KWLIST, &q))
     goto end;
-  Py_INCREF(q);
-  if (!PySequence_Check(q)) TYERR("want a sequence of moduli");
-  n = PySequence_Size(q);
-  if (PyErr_Occurred()) goto end;
-  if (!n) VALERR("want at least one modulus");
-  v = xmalloc(n * sizeof(*v));
-  for (i = 0; i < n; i++) {
-    if ((x = PySequence_GetItem(q, i)) == 0) goto end;
+
+  if (!PySequence_Check(q))
+    n = 16;
+  else {
+    n = PySequence_Size(arg);
+    if (n == (size_t)-1 && PyErr_Occurred()) goto end;
+  }
+
+  v = xmalloc(n*sizeof(*v));
+  it = PyObject_GetIter(q); if (!it) goto end;
+  for (;;) {
+    x = PyIter_Next(it); if (!x) break;
     xx = getmp(x); Py_DECREF(x); if (!xx) goto end;
-    v[i].m = xx; v[i].n = 0; v[i].ni = 0; v[i].nni = 0;
+    if (MP_CMP(xx, <=, MP_ZERO)) VALERR("moduli must be positive");
+    if (i >= n) { n *= 2; v = xrealloc(v, n*sizeof(*v), i*sizeof(*v)); }
+    v[i].m = xx; v[i].n = 0; v[i].ni = 0; v[i].nni = 0; i++; xx = MP_NEW;
   }
+  if (PyErr_Occurred()) goto end;
+  Py_DECREF(it); it = 0;
+
+  mpmul_init(&mm);
+  for (j = 0; j < i; j++) mpmul_add(&mm, v[j].m);
+  xx = mpmul_done(&mm);
+  for (j = 0; j < i; j++) {
+    mp_div(&y, 0, xx, v[j].m);
+    mp_gcd(&g, 0, 0, y, v[j].m);
+    if (!MP_EQ(g, MP_ONE)) VALERR("moduli must be pairwise coprime");
+  }
+
   c = (mpcrt_pyobj *)ty->tp_alloc(ty, 0);
-  mpcrt_create(&c->c, v, n, 0);
-  Py_DECREF(q);
+  mpcrt_create(&c->c, v, i, 0);
+  mp_drop(xx); mp_drop(y); mp_drop(g);
   return ((PyObject *)c);
 
 end:
   if (v) {
-    n = i;
-    for (i = 0; i < n; i++)
-      MP_DROP(v[i].m);
+    while (i--) MP_DROP(v[i].m);
     xfree(v);
   }
-  Py_XDECREF(q);
+  mp_drop(xx); mp_drop(y); mp_drop(g);
+  Py_XDECREF(it);
   return (0);
 }
 
@@ -1760,11 +1892,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")
@@ -1772,15 +1904,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@ */
@@ -1804,7 +1936,7 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"A context for the solution of Chinese Remainder Theorem problems.",
+  "MPCRT(SEQ): a context for solving Chinese Remainder Theorem problems.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1812,9 +1944,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@ */
@@ -1830,7 +1962,7 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
 /*----- Binary polynomials ------------------------------------------------*/
 
 static PyObject *gf_pyrepr(PyObject *o)
-  { return mp_topystring(MP_X(o), 16, "GF(", "0x", "L)"); }
+  { return mp_topystring(MP_X(o), 16, "GF(", "0x", ")"); }
 
 static PyObject *gf_pyrichcompare(PyObject *x, PyObject *y, int op)
 {
@@ -1864,15 +1996,15 @@ static PyObject *gf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   mp *z;
   mp_pyobj *zz = 0;
   int radix = 0;
-  char *kwlist[] = { "x", "radix", 0 };
+  static const char *const kwlist[] = { "x", "radix", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:gf", kwlist, &x, &radix))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:gf", KWLIST, &x, &radix))
     goto end;
   if (GF_PYCHECK(x)) RETURN_OBJ(x);
   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)) {
@@ -1885,23 +2017,14 @@ end:
   return ((PyObject *)zz);
 }
 
-static long gf_pyhash(PyObject *me)
-{
-  long i = mp_tolong(MP_X(me));
-  i ^= 0xc7ecd67c; /* random perturbance */
-  if (i == -1)
-    i = -2;
-  return (i);
-}
-
 static PyObject *gf_pyexp(PyObject *x, PyObject *y, PyObject *z)
 {
   mp *xx = 0, *yy = 0, *zz = 0;
   mp *r = 0;
   PyObject *rc = 0;
 
-  if ((xx = tomp(x)) == 0 || (yy = tomp(y)) == 0 ||
-      (z && z != Py_None && (zz = tomp(z)) == 0)) {
+  if ((xx = implicitgf(x)) == 0 || (yy = implicitmp(y)) == 0 ||
+      (z && z != Py_None && (zz = implicitgf(z)) == 0)) {
     mp_drop(xx); mp_drop(yy); mp_drop(zz);
     RETURN_NOTIMPL;
   }
@@ -1925,11 +2048,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)
 {
@@ -1973,16 +2093,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
@@ -1993,36 +2137,45 @@ 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	(_implicit,	0)
+  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(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")
+  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@ */
+#ifdef PY2
   0,					/* @nb_divide@ */
+#endif
   gf_pymod,				/* @nb_remainder@ */
   gf_pydivmod,				/* @nb_divmod@ */
   gf_pyexp,				/* @nb_power@ */
@@ -2036,17 +2189,23 @@ static PyNumberMethods gf_pynumber = {
   gf_pyand,				/* @nb_and@ */
   gf_pyxor,				/* @nb_xor@ */
   gf_pyor,				/* @nb_or@ */
+#ifdef PY2
   gf_pycoerce,				/* @nb_coerce@ */
+#endif
   mp_pyint,				/* @nb_int@ */
-  mp_pylong,				/* @nb_long@ */
+  PY23(mp_pylong, 0),			/* @nb_long@ */
   0 /* doesn't make any sense */,	/* @nb_float@ */
+#ifdef PY2
   mp_pyoct,				/* @nb_oct@ */
   mp_pyhex,				/* @nb_hex@ */
+#endif
 
   0,					/* @nb_inplace_add@ */
   0,					/* @nb_inplace_subtract@ */
   0,					/* @nb_inplace_multiply@ */
+#ifdef PY2
   0,					/* @nb_inplace_divide@ */
+#endif
   0,					/* @nb_inplace_remainder@ */
   0,					/* @nb_inplace_power@ */
   0,					/* @nb_inplace_lshift@ */
@@ -2059,10 +2218,12 @@ static PyNumberMethods gf_pynumber = {
   0,					/* @nb_true_divide@ */
   0,					/* @nb_inplace_floor_divide@ */
   0,					/* @nb_inplace_true_divide@ */
+
+  mp_pyint,				/* @nb_index@ */
 };
 
-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@ */
@@ -2073,10 +2234,10 @@ 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@ */
-  gf_pyhash,				/* @tp_hash@ */
+  mp_pyhash,				/* @tp_hash@ */
   0,					/* @tp_call@ */
   mp_pyhex,				/* @tp_str@ */
   0,					/* @tp_getattro@ */
@@ -2087,19 +2248,24 @@ 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 ints and longs.\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 division.  GFs don't have `/' 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"
+  PY23(
+  "points, group elements, Python `int' and `long' objects, and anything\n"
+  "with an integer conversion.\n",
+  "points, group elements, Python `int' objects, and anything with an\n"
+  "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@ */
@@ -2107,9 +2273,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@ */
@@ -2122,35 +2288,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;
-  char *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;
@@ -2249,10 +2390,10 @@ static PyObject *gfreduce_pynew(PyTypeObject *ty,
 {
   gfreduce_pyobj *mr = 0;
   gfreduce r;
-  char *kwlist[] = { "m", 0 };
+  static const char *const kwlist[] = { "m", 0 };
   mp *xx = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convgf, &xx))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convgf, &xx))
     goto end;
   if (MP_ZEROP(xx)) ZDIVERR("modulus is zero!");
   gfreduce_create(&r, xx);
@@ -2266,18 +2407,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")
@@ -2285,8 +2426,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@ */
@@ -2310,7 +2451,7 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"A reduction context for reduction modulo sparse irreducible polynomials.",
+  "GFReduce(N): a context for reduction modulo sparse polynomials.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2318,9 +2459,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@ */
@@ -2335,14 +2476,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)
@@ -2351,14 +2492,15 @@ static PyObject *gfn_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   mp *p = 0, *beta = 0;
   gfn_pyobj *gg = 0;
-  char *kwlist[] = { "p", "beta", 0 };
+  static const char *const kwlist[] = { "p", "beta", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&:new", KWLIST,
 				   convgf, &p, convgf, &beta))
     goto end;
   gg = PyObject_New(gfn_pyobj, ty);
+  gg->p = 0;
   if (gfn_create(p, beta, &gg->ntop, &gg->pton)) {
-    FREEOBJ(gg);
+    Py_DECREF(gg);
     gg = 0;
     VALERR("can't invert transformation matrix");
   }
@@ -2390,7 +2532,7 @@ static PyObject *gfnget_beta(PyObject *me, void *hunoz)
   end:									\
     mp_drop(xx);							\
     if (!z) return (0);							\
-    return (mp_pywrap(z));						\
+    return (gf_pywrap(z));						\
   }
 XFORMOP(pton, PTON)
 XFORMOP(ntop, NTOP)
@@ -2398,12 +2540,15 @@ XFORMOP(ntop, NTOP)
 
 static void gfn_pydealloc(PyObject *me)
 {
-  gfn_destroy(GFN_PTON(me));
-  gfn_destroy(GFN_NTOP(me));
+  if (GFN_P(me)) {
+    MP_DROP(GFN_P(me));
+    gfn_destroy(GFN_PTON(me));
+    gfn_destroy(GFN_NTOP(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")
@@ -2411,7 +2556,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")
@@ -2419,8 +2564,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@ */
@@ -2444,8 +2589,8 @@ static PyTypeObject gfn_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"An object for transforming elements of binary fields between polynomial\n\
-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@ */
@@ -2453,9 +2598,9 @@ and normal basis representations.",
   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@ */
@@ -2470,41 +2615,8 @@ and normal basis representations.",
 
 /*----- 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 }
 };
 
@@ -2519,7 +2631,6 @@ void mp_pyinit(void)
   INITTYPE(mpcrt, root);
   INITTYPE(gfreduce, root);
   INITTYPE(gfn, root);
-  addmethods(methods);
 }
 
 void mp_pyinsert(PyObject *mod)
@@ -2533,6 +2644,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 -------------------------------------------------*/