X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/a157093f4bbc3066fea2f77078b99489c76e62f8..91e56f0647ff205643debd5cdb93797ea0e8da24:/group.c

diff --git a/group.c b/group.c
index 254f8ce..62e67b3 100644
--- a/group.c
+++ b/group.c
@@ -622,11 +622,10 @@ BINOP(div)
 #undef BINOP
 
 #define UNOP(name)							\
-  static PyObject *gemeth_##name(PyObject *me, PyObject *arg)		\
+  static PyObject *gemeth_##name(PyObject *me)				\
   {									\
     group *g;								\
     ge *z;								\
-    if (!PyArg_ParseTuple(arg, ":" #name)) return (0);			\
     g = GE_G(me);							\
     z = G_CREATE(g);							\
     g->ops->name(g, z, GE_X(me));					\
@@ -696,9 +695,8 @@ end:
   return (rc);
 }
 
-static PyObject *gemeth_check(PyObject *me, PyObject *arg)
+static PyObject *gemeth_check(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":check")) goto end;
   if (group_check(GE_G(me), GE_X(me))) VALERR("bad group element");
   RETURN_OBJ(me);
 end:
@@ -747,11 +745,10 @@ end:
   return (rc);
 }
 
-static PyObject *gemeth_toint(PyObject *me, PyObject *arg)
+static PyObject *gemeth_toint(PyObject *me)
 {
   mp *x;
 
-  if (!PyArg_ParseTuple(arg, ":toint")) goto end;
   if ((x = G_TOINT(GE_G(me), MP_NEW, GE_X(me))) == 0)
     TYERR("can't convert to integer");
   return (mp_pywrap(x));
@@ -792,13 +789,12 @@ end:
   return (rc);
 }
 
-static PyObject *gemeth_tobuf(PyObject *me, PyObject *arg)
+static PyObject *gemeth_tobuf(PyObject *me)
 {
   buf b;
   PyObject *rc;
   size_t n;
 
-  if (!PyArg_ParseTuple(arg, ":tobuf")) return (0);
   n = GE_G(me)->noctets + 4;
   rc = bytestring_pywrap(0, n);
   buf_init(&b, PyString_AS_STRING(rc), n);
@@ -808,13 +804,12 @@ static PyObject *gemeth_tobuf(PyObject *me, PyObject *arg)
   return (rc);
 }
 
-static PyObject *gemeth_toraw(PyObject *me, PyObject *arg)
+static PyObject *gemeth_toraw(PyObject *me)
 {
   buf b;
   PyObject *rc;
   size_t n;
 
-  if (!PyArg_ParseTuple(arg, ":toraw")) return (0);
   n = GE_G(me)->noctets;
   rc = bytestring_pywrap(0, n);
   buf_init(&b, PyString_AS_STRING(rc), n);
@@ -996,14 +991,14 @@ static const PyGetSetDef ge_pygetset[] = {
 
 static const PyMethodDef ge_pymethods[] = {
 #define METHNAME(name) gemeth_##name
-  METH	(inv,		"X.inv() -> inverse element of X")
-  METH	(sqr,		"X.sqr() -> X^2 = X * X")
-  METH	(check,		"X.check() -> check X really belongs to its group")
-  METH	(toint,		"X.toint() -> X converted to an integer")
+  NAMETH(inv,		"X.inv() -> inverse element of X")
+  NAMETH(sqr,		"X.sqr() -> X^2 = X * X")
+  NAMETH(check,		"X.check() -> check X really belongs to its group")
+  NAMETH(toint,		"X.toint() -> X converted to an integer")
   KWMETH(toec,		"X.toec([curve = ECPt]) -> "
 				       "X converted to elliptic curve point")
-  METH	(tobuf,		"X.tobuf() -> X in buffer representation")
-  METH	(toraw,		"X.toraw() -> X in raw representation")
+  NAMETH(tobuf,		"X.tobuf() -> X in buffer representation")
+  NAMETH(toraw,		"X.toraw() -> X in raw representation")
   CMTH	(frombuf,	"frombuf(BUF) -> X, REST")
   CMTH	(fromraw,	"fromraw(BUF) -> X, REST")
   CMTH	(fromstring,	"fromstring(STR) -> X, REST")