*.c: Use Python `METH_NOARGS' methods where applicable.

[catacomb-python] / mp.c

diff --git a/mp.c b/mp.c
index 29e8881..2fc82b2 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -593,25 +593,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:
@@ -745,14 +740,13 @@ 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);
@@ -858,9 +852,9 @@ static const PyMethodDef mp_pymethods[] = {
   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)")
@@ -876,7 +870,7 @@ static const PyMethodDef mp_pymethods[] = {
                                     "little-endian bytes, two's complement")
   KWMETH(storeb2c,     "X.storeb2c([len = -1]) -> "
                                        "big-endian bytes, two's complement")
-  METH (tobuf,         "X.tobuf() -> buffer format")
+  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"
@@ -1047,11 +1041,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;
@@ -1090,7 +1083,7 @@ static const PyGetSetDef mpmul_pygetset[] = {
 static const PyMethodDef mpmul_pymethods[] = {
 #define METHNAME(name) mmmeth_##name
   METH (factor,        "MM.factor(ITERABLE) or MM.factor(I, ...)")
-  METH (done,          "MM.done() -> PRODUCT")
+  NAMETH(done,         "MM.done() -> PRODUCT")
 #undef METHNAME
   { 0 }
 };
@@ -1948,11 +1941,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)
 {
@@ -2023,11 +2013,8 @@ end:
   return (z);
 }
 
-static PyObject *gfmeth_irreduciblep(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":irreduciblep")) return (0);
-  return getbool(gf_irreduciblep(MP_X(me)));
-}
+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)); }
@@ -2048,11 +2035,11 @@ static const PyMethodDef gf_pymethods[] = {
   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 (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"
@@ -2069,7 +2056,7 @@ static const PyMethodDef gf_pymethods[] = {
                                     "little-endian bytes, two's complement")
   KWMETH(storeb2c,     "X.storeb2c([len = -1]) -> "
                                        "big-endian bytes, two's complement")
-  METH (tobuf,         "X.tobuf() -> buffer format")
+  NAMETH(tobuf,                "X.tobuf() -> buffer format")
 #undef METHNAME
   { 0 }
 };