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

diff --git a/key.c b/key.c
index 5f097f0..a4caa50 100644
--- a/key.c
+++ b/key.c
@@ -339,13 +339,8 @@ static PyObject *kdmeth_matchp(PyObject *me, PyObject *arg)
   return (getbool(KEY_MATCH(KEYDATA_KD(me), &f)));
 }
 
-static PyObject *kdmeth_split(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":split"))
-    return (0);
-  key_split(&KEYDATA_KD(me));
-  RETURN_ME;
-}
+static PyObject *kdmeth_split(PyObject *me)
+  { key_split(&KEYDATA_KD(me)); RETURN_ME; }
 
 static PyObject *kdmeth_copy(PyObject *me, PyObject *arg, PyObject *kw)
 {
@@ -459,7 +454,7 @@ static PyObject *kdget_flags(PyObject *me, void *hunoz)
 static const PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func
   METH	(matchp,	"KD.matchp(FILTER) -> BOOL")
-  METH	(split,		"KD.split()")
+  NAMETH(split,		"KD.split()")
   KWMETH(write,		"KD.write([filter = <any>]) -> STRING")
   KWMETH(encode,	"KD.encode([filter = <any>]) -> BYTES")
   KWMETH(copy,		"KD.copy([filter = <any>]) -> KD")
@@ -1407,22 +1402,20 @@ static void key_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static PyObject *kmeth_delete(PyObject *me, PyObject *arg)
+static PyObject *kmeth_delete(PyObject *me)
 {
   int err;
 
-  if (!PyArg_ParseTuple(arg, ":delete")) goto end;
   if ((err = key_delete(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err);
   RETURN_ME;
 end:
   return (0);
 }
 
-static PyObject *kmeth_expire(PyObject *me, PyObject *arg)
+static PyObject *kmeth_expire(PyObject *me)
 {
   int err;
 
-  if (!PyArg_ParseTuple(arg, ":expire")) goto end;
   if ((err = key_expire(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err);
   RETURN_ME;
 end:
@@ -1596,8 +1589,8 @@ end:
 
 static const PyMethodDef key_pymethods[] = {
 #define METHNAME(func) kmeth_##func
-  METH	(delete,	"KEY.delete()")
-  METH	(expire,	"KEY.expire()")
+  NAMETH(delete,	"KEY.delete()")
+  NAMETH(expire,	"KEY.expire()")
   METH	(used,		"KEY.used(TIME)")
   KWMETH(extract,	"KEY.extract(FILE, [filter = <any>])")
   KWMETH(fingerprint,	"KEY.fingerprint(HASH, [filter = '-secret'])")
@@ -1809,10 +1802,8 @@ static void keyfile_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static PyObject *kfmeth_save(PyObject *me, PyObject *arg)
+static PyObject *kfmeth_save(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":save"))
-    goto end;
   switch (key_save(KEYFILE_KF(me))) {
     case KWRITE_OK:
       RETURN_ME;
@@ -1989,7 +1980,7 @@ static PyObject *kfget_filep(PyObject *me, void *hunoz)
 
 static const PyMethodDef keyfile_pymethods[] = {
 #define METHNAME(func) kfmeth_##func
-  METH	(save,		"KF.save()")
+  NAMETH(save,		"KF.save()")
   KWMETH(merge,		"KF.merge(FILE, [report = <built-in-reporter>])")
   KWMETH(newkey,	"KF.newkey(ID, TYPE, [exptime = KEXP_FOREVER]) "
 								    "-> KEY")