X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/457b4e971a2795898c83a53ae4c27d6a893690d1..d26c1ca84b76aa4c85b33ffbb0ee0a82cb75c092:/key.c

diff --git a/key.c b/key.c
index 8dec99c..5511699 100644
--- a/key.c
+++ b/key.c
@@ -465,9 +465,9 @@ static PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func
   METH	(matchp,		"KD.matchp(FILTER) -> BOOL")
   METH	(split,			"KD.split()")
-  KWMETH(write,			"KD.write(filter = <any>) -> STRING")
-  KWMETH(encode,		"KD.encode(filter = <any>) -> BYTES")
-  KWMETH(copy,			"KD.copy(filter = <any>) -> KD")
+  KWMETH(write,			"KD.write([filter = <any>]) -> STRING")
+  KWMETH(encode,		"KD.encode([filter = <any>]) -> BYTES")
+  KWMETH(copy,			"KD.copy([filter = <any>]) -> KD")
   METH	(plock,			"KD.plock(TAG) -> ENCRYPTED-KD")
   METH	(lock,			"KD.lock(KEY) -> ENCRYPTED-KD")
 #undef METHNAME
@@ -1497,6 +1497,7 @@ static int kset_exptime(PyObject *me, PyObject *x, void *hunoz)
   key *k = KEY_K(me);
   unsigned long et;
 
+  if (!x) NIERR("__del__");
   if (!convulong(x, &et))
     goto end;
   if (!(KEY_KF(me)->f & KF_WRITE))
@@ -1513,6 +1514,7 @@ static int kset_deltime(PyObject *me, PyObject *x, void *hunoz)
   key *k = KEY_K(me);
   unsigned long dt;
 
+  if (!x) NIERR("__del__");
   if (!convulong(x, &dt))
     goto end;
   if (dt == KEXP_FOREVER && k->exp != KEXP_FOREVER)
@@ -1597,8 +1599,8 @@ static PyMethodDef key_pymethods[] = {
   METH	(delete,	"KEY.delete()")
   METH	(expire,	"KEY.expire()")
   METH	(used,		"KEY.used(TIME)")
-  KWMETH(extract,	"KEY.extract(FILE, filter = '')")
-  KWMETH(fingerprint,	"KEY.fingerprint(HASH, filtr = '-secret')")
+  KWMETH(extract,	"KEY.extract(FILE, [filter = <any>])")
+  KWMETH(fingerprint,	"KEY.fingerprint(HASH, [filter = '-secret'])")
 #undef METHNAME
   { 0 }
 };
@@ -1988,12 +1990,13 @@ static PyObject *kfget_filep(PyObject *me, void *hunoz)
 static PyMethodDef keyfile_pymethods[] = {
 #define METHNAME(func) kfmeth_##func
   METH	(save,		"KF.save()")
-  KWMETH(merge,		"KF.merge(FILE, report = <built-in-reporter>)")
-  KWMETH(newkey,	"KF.newkey(ID, TYPE, exptime = KEXP_FOREVER) -> KEY")
+  KWMETH(merge,		"KF.merge(FILE, [report = <built-in-reporter>])")
+  KWMETH(newkey,	"KF.newkey(ID, TYPE, "
+				"[exptime = KEXP_FOREVER]) -> KEY")
   METH	(byid,		"KF.byid(KEYID) -> KEY|None")
   METH	(bytype,	"KF.bytype(TYPE) -> KEY|None")
   METH	(bytag,		"KF.bytag(TAG) -> KEY|None")
-  KWMETH(qtag,		"KF.qtag(TAG, new = KD) -> FULLTAG, KEY, OLDKD")
+  KWMETH(qtag,		"KF.qtag(TAG, [new = KD]) -> FULLTAG, KEY, OLDKD")
   GMAP_ROMETHODS
 #undef METHNAME
   { 0 }