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

diff --git a/key.c b/key.c
index c4ccfa9..5511699 100644
--- a/key.c
+++ b/key.c
@@ -104,7 +104,7 @@ static PyMethodDef keyexc_pymethods[] = {
 
 static void keyexc_raise(int err)
 {
-  PyObject *arg = Py_BuildValue("(i)", err);
+  PyObject *arg = Py_BuildValue("(is)", err, key_strerror(err));
   if (arg) PyErr_SetObject(keyexc, arg);
   Py_XDECREF(arg);
 }
@@ -414,7 +414,7 @@ end:
 static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   PyObject *rc = 0;
   key_data *kd;
 
@@ -445,7 +445,7 @@ end:
 static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
 {
   const char *p;
-  int n;
+  Py_ssize_t n;
   key_data *kd;
   PyObject *rc = 0;
 
@@ -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.encode(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
@@ -483,7 +483,7 @@ static PyGetSetDef keydata_pygetset[] = {
 
 static PyTypeObject keydata_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyData",			/* @tp_name@ */
+  "KeyData",				/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -533,7 +533,7 @@ static PyObject *keydatabin_pynew(PyTypeObject *ty,
 				  PyObject *arg, PyObject *kw)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
@@ -560,7 +560,7 @@ static PyGetSetDef keydatabin_pygetset[] = {
 
 static PyTypeObject keydatabin_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataBinary",		/* @tp_name@ */
+  "KeyDataBinary",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -610,7 +610,7 @@ static PyObject *keydataenc_pynew(PyTypeObject *ty,
 				  PyObject *arg, PyObject *kw)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
@@ -636,7 +636,7 @@ end:
 static PyObject *kdemeth_lock(PyObject *me, PyObject *arg)
 {
   char *hunoz;
-  int hukairz;
+  Py_ssize_t hukairz;
   if (!PyArg_ParseTuple(arg, "s#:lock", &hunoz, &hukairz)) goto end;
   KEYERR(KERR_WRONGTYPE);
 end:
@@ -662,7 +662,7 @@ end:
 static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   int err;
   PyObject *rc = 0;
   key_data *kd;
@@ -697,7 +697,7 @@ static PyGetSetDef keydataenc_pygetset[] = {
 
 static PyTypeObject keydataenc_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataEncrypted",		/* @tp_name@ */
+  "KeyDataEncrypted",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -773,7 +773,7 @@ static PyGetSetDef keydatamp_pygetset[] = {
 
 static PyTypeObject keydatamp_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataMP",			/* @tp_name@ */
+  "KeyDataMP",				/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -848,7 +848,7 @@ static PyGetSetDef keydatastr_pygetset[] = {
 
 static PyTypeObject keydatastr_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataString",		/* @tp_name@ */
+  "KeyDataString",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -928,7 +928,7 @@ static PyGetSetDef keydataec_pygetset[] = {
 
 static PyTypeObject keydataec_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataECPt",		/* @tp_name@ */
+  "KeyDataECPt",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -999,7 +999,7 @@ static void subkeyiter_pydealloc(PyObject *me)
 
 static PyTypeObject subkeyiter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.SubKeyIter",		/* @tp_name@ */
+  "SubKeyIter",				/* @tp_name@ */
   sizeof(subkeyiter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1134,7 +1134,7 @@ static PyMappingMethods keydatastruct_pymapping = {
 
 static PyTypeObject keydatastruct_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataStructured",		/* @tp_name@ */
+  "KeyDataStructured",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1210,7 +1210,7 @@ static void keyattriter_pydealloc(PyObject *me)
 
 static PyTypeObject keyattriter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyAttributeIter",		/* @tp_name@ */
+  "KeyAttributeIter",			/* @tp_name@ */
   sizeof(keyattriter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1320,7 +1320,7 @@ static PyMappingMethods keyattrs_pymapping = {
 
 static PyTypeObject keyattrs_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyAttributes",		/* @tp_name@ */
+  "KeyAttributes",			/* @tp_name@ */
   sizeof(keyattrs_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -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 }
 };
@@ -1622,7 +1624,7 @@ static PyGetSetDef key_pygetset[] = {
 
 static PyTypeObject key_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.Key",			/* @tp_name@ */
+  "Key",				/* @tp_name@ */
   sizeof(key_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1696,7 +1698,7 @@ static void keyiter_pydealloc(PyObject *me)
 
 static PyTypeObject keyiter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyFileIter",		/* @tp_name@ */
+  "KeyFileIter",			/* @tp_name@ */
   sizeof(keyiter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1969,7 +1971,7 @@ static PyObject *kfmeth_qtag(PyObject *me, PyObject *arg, PyObject *kw)
   }
   key_incref(*kd);
   rc = Py_BuildValue("(s#NN)",
-		     d.buf, d.len,
+		     d.buf, (Py_ssize_t)d.len,
 		     key_pywrap(me, k),
 		     keydata_pywrap(okd));
 end:
@@ -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 }
@@ -2017,7 +2020,7 @@ static PyMappingMethods keyfile_pymapping = {
 
 static PyTypeObject keyfile_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyFile",			/* @tp_name@ */
+  "KeyFile",				/* @tp_name@ */
   sizeof(keyfile_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -2081,7 +2084,7 @@ static PyMethodDef methods[] = {
 	   "KeyData.readflags(STRING) -> (FLAGS, MASK, REST)")
   METH	(_KeyData_writeflags,	"KeyData.writeflags(FLAGS) -> STRING")
   METH	(_KeyData_read,		"KeyData.read(STRING) -> (KD, REST)")
-  METH	(_KeyData_decode,	"KeyData.read(BYTES) -> KD")
+  METH	(_KeyData_decode,	"KeyData.decode(BYTES) -> KD")
   METH	(barf,			"barf(ERR)")
 #undef METHNAME
   { 0 }