X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/06cd26e87f5b839d40f0e7b57e38aea6c231b385..637b91402d2497db1318debd3cb3868a5abb8f01:/key.c

diff --git a/key.c b/key.c
index c5b0ac0..b6a8c6a 100644
--- a/key.c
+++ b/key.c
@@ -36,29 +36,31 @@ static PyObject *keyfilebrokenexc;
 
 static PyObject *kxmeth___init__(PyObject *me, PyObject *arg)
 {
-  int err;
+  long err;
   PyObject *x = 0;
+  Py_ssize_t n;
 
-  if (!PyArg_ParseTuple(arg, "Oi:__init__", &me, &err) ||
-      (x = PyInt_FromLong(err)) == 0 ||
-      PyObject_SetAttrString(me, "err", x))
-    goto fail;
-  Py_DECREF(x); x = 0;
-  if ((x = PyString_FromString(key_strerror(err))) == 0 ||
-      PyObject_SetAttrString(me, "errstring", x))
-    goto fail;
+  n = PyTuple_GET_SIZE(arg);
+  if (n < 2) TYERR("__init__() takes at least two arguments");
+  me = PyTuple_GET_ITEM(arg, 0);
+  err = PyInt_AsLong(PyTuple_GET_ITEM(arg, 1));
+  if (err == -1 && PyErr_Occurred()) goto end;
+  if (INT_MIN > err || err > INT_MAX) OVFERR("error code out of range");
+
+  x = PyInt_FromLong(err); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "err", x)) goto end;
   Py_DECREF(x); x = 0;
-  if ((x = PyString_FromString(key_strerror(err))) == 0 ||
-      PyObject_SetAttrString(me, "errstring", x))
-    goto fail;
+
+  x = PyString_FromString(key_strerror(err)); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "errstring", x)) goto end;
   Py_DECREF(x); x = 0;
-  if ((x = PySequence_GetSlice(arg, 1, PySequence_Size(arg))) == 0 ||
-      PyObject_SetAttrString(me, "args", x))
-    goto fail;
+
+  x = PyTuple_GetSlice(arg, 1, n); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "args", x)) goto end;
   Py_DECREF(x); x = 0;
   RETURN_NONE;
 
-fail:
+end:
   Py_XDECREF(x);
   return (0);
 }
@@ -94,17 +96,17 @@ done:
   return (rc);
 }
 
-static PyMethodDef keyexc_pymethods[] = {
+static const PyMethodDef keyexc_pymethods[] = {
 #define METHNAME(func) kxmeth_##func
-  METH	(__init__,		"KeyError(CODE)")
-  METH	(__str__,		"E.__str__() -> STRING")
+  METH	(__init__,	"KeyError(CODE)")
+  METH	(__str__,	"E.__str__() -> STRING")
 #undef METHNAME
   { 0 }
 };
 
 static void keyexc_raise(int err)
 {
-  PyObject *arg = Py_BuildValue("(is)", err, key_strerror(err));
+  PyObject *arg = Py_BuildValue("(i)", err);
   if (arg) PyErr_SetObject(keyexc, arg);
   Py_XDECREF(arg);
 }
@@ -229,8 +231,8 @@ static int convfilter(PyObject *x, void *p)
       goto end;
     else if (n != 2)
       goto tyerr;
-    else if ((a = PySequence_GetItem(x, 0)) == 0 || convuint(a, &f->f) ||
-	     (b = PySequence_GetItem(x, 1)) == 0 || convuint(b, &f->m))
+    else if ((a = PySequence_GetItem(x, 0)) == 0 || !convuint(a, &f->f) ||
+	     (b = PySequence_GetItem(x, 1)) == 0 || !convuint(b, &f->m))
       goto end;
   }
   rc = 1;
@@ -351,10 +353,10 @@ static PyObject *kdmeth_split(PyObject *me, PyObject *arg)
 static PyObject *kdmeth_copy(PyObject *me, PyObject *arg, PyObject *kw)
 {
   key_filter f = { 0, 0 };
-  static char *kwlist[] = { "filter", 0 };
+  static const char *const kwlist[] = { "filter", 0 };
   key_data *kd;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:copy", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:copy", KWLIST,
 				   convfilter, &f))
     return (0);
   if ((kd = key_copydata(KEYDATA_KD(me), &f)) == 0)
@@ -368,9 +370,9 @@ static PyObject *kdmeth_write(PyObject *me, PyObject *arg, PyObject *kw)
   key_filter f = { 0, 0 };
   dstr d = DSTR_INIT;
   PyObject *rc = 0;
-  static char *kwlist[] = { "filter", 0 };
+  static const char *const kwlist[] = { "filter", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:write", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:write", KWLIST,
 				   convfilter, &f))
     return (0);
   key_write(KEYDATA_KD(me), &d, &f);
@@ -384,9 +386,9 @@ static PyObject *kdmeth_encode(PyObject *me, PyObject *arg, PyObject *kw)
   key_filter f = { 0, 0 };
   dstr d = DSTR_INIT;
   PyObject *rc = 0;
-  static char *kwlist[] = { "filter", 0 };
+  static const char *const kwlist[] = { "filter", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:encode", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:encode", KWLIST,
 				   convfilter, &f))
     return (0);
   key_encode(KEYDATA_KD(me), &d, &f);
@@ -461,22 +463,22 @@ end:
 static PyObject *kdget_flags(PyObject *me, void *hunoz)
   { return (getulong(KEYDATA_KD(me)->e)); }
 
-static PyMethodDef keydata_pymethods[] = {
+static const 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")
-  METH	(plock,			"KD.plock(TAG) -> ENCRYPTED-KD")
-  METH	(lock,			"KD.lock(KEY) -> ENCRYPTED-KD")
+  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")
+  METH	(plock,		"KD.plock(TAG) -> ENCRYPTED-KD")
+  METH	(lock,		"KD.lock(KEY) -> ENCRYPTED-KD")
 #undef METHNAME
   { 0 }
 };
 
-static PyGetSetDef keydata_pygetset[] = {
+static const PyGetSetDef keydata_pygetset[] = {
 #define GETSETNAME(op, name) kd##op##_##name
-  GET	(flags,			"KD.flags -> FLAGS")
+  GET	(flags,		"KD.flags -> FLAGS")
 #undef GETSETNAME
   { 0 }
 };
@@ -506,7 +508,7 @@ static PyTypeObject keydata_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data base class.",
+  "Key data base class.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -514,9 +516,9 @@ static PyTypeObject keydata_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keydata_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keydata),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydata_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydata),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -536,9 +538,9 @@ static PyObject *keydatabin_pynew(PyTypeObject *ty,
   Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
-  static char *kwlist[] = { "key", "flags", 0 };
+  static const char *const kwlist[] = { "key", "flags", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", KWLIST,
 				   &p, &n, convflags, &f))
     goto end;
   me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
@@ -551,9 +553,9 @@ static PyObject *kdbget_bin(PyObject *me, void *hunoz)
   { return (bytestring_pywrap(KEYDATA_KD(me)->u.k.k,
 			      KEYDATA_KD(me)->u.k.sz)); }
 
-static PyGetSetDef keydatabin_pygetset[] = {
+static const PyGetSetDef keydatabin_pygetset[] = {
 #define GETSETNAME(op, name) kdb##op##_##name
-  GET	(bin,			"KD.bin -> BYTES")
+  GET	(bin,		"KD.bin -> BYTES")
 #undef GETSETNAME
   { 0 }
 };
@@ -583,7 +585,7 @@ static PyTypeObject keydatabin_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataBinary(KEY, [flags = 0]): key data for binary keys.",
+  "KeyDataBinary(KEY, [flags = 0]): key data for binary keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -593,7 +595,7 @@ static PyTypeObject keydatabin_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatabin_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatabin),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -613,9 +615,9 @@ static PyObject *keydataenc_pynew(PyTypeObject *ty,
   Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
-  static char *kwlist[] = { "key", "flags", 0 };
+  static const char *const kwlist[] = { "key", "flags", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", KWLIST,
 				   &p, &n, convflags, &f))
     goto end;
   me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
@@ -678,19 +680,19 @@ end:
 
 #define kdeget_ct kdbget_bin
 
-static PyMethodDef keydataenc_pymethods[] = {
+static const PyMethodDef keydataenc_pymethods[] = {
 #define METHNAME(func) kdemeth_##func
-  METH	(plock,			"KD.plock(TAG) -> ENCRYPTED-KD")
-  METH	(lock,			"KD.lock(KEY) -> ENCRYPTED-KD")
-  METH	(punlock,		"KD.punlock(TAG) -> KD")
-  METH	(unlock,		"KD.unlock(KEY) -> KD")
+  METH	(plock,		"KD.plock(TAG) -> ENCRYPTED-KD")
+  METH	(lock,		"KD.lock(KEY) -> ENCRYPTED-KD")
+  METH	(punlock,	"KD.punlock(TAG) -> KD")
+  METH	(unlock,	"KD.unlock(KEY) -> KD")
 #undef METHNAME
   { 0 }
 };
 
-static PyGetSetDef keydataenc_pygetset[] = {
+static const PyGetSetDef keydataenc_pygetset[] = {
 #define GETSETNAME(op, name) kde##op##_##name
-  GET	(ct,			"KD.ct -> BYTES")
+  GET	(ct,		"KD.ct -> BYTES")
 #undef GETSETNAME
   { 0 }
 };
@@ -720,7 +722,7 @@ static PyTypeObject keydataenc_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataEncrypted(KEY, [flags = 0]): key data for encrypted keys.",
+  "KeyDataEncrypted(KEY, [flags = 0]): key data for encrypted keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -728,9 +730,9 @@ static PyTypeObject keydataenc_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keydataenc_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keydataenc),		/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydataenc_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydataenc),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -749,9 +751,9 @@ static PyObject *keydatamp_pynew(PyTypeObject *ty,
   mp *x = 0;
   unsigned f = 0;
   keydata_pyobj *me = 0;
-  static char *kwlist[] = { "key", "flags", 0 };
+  static const char *const kwlist[] = { "key", "flags", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
 				   convmp, &x, convflags, &f))
     goto end;
   me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
@@ -764,9 +766,9 @@ end:
 static PyObject *kdmget_mp(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(KEYDATA_KD(me)->u.m))); }
 
-static PyGetSetDef keydatamp_pygetset[] = {
+static const PyGetSetDef keydatamp_pygetset[] = {
 #define GETSETNAME(op, name) kdm##op##_##name
-  GET	(mp,			"KD.mp -> X")
+  GET	(mp,		"KD.mp -> X")
 #undef GETSETNAME
   { 0 }
 };
@@ -796,7 +798,7 @@ static PyTypeObject keydatamp_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataMP(KEY, [flags = 0]): key data for large-integer keys.",
+  "KeyDataMP(KEY, [flags = 0]): key data for large-integer keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -806,7 +808,7 @@ static PyTypeObject keydatamp_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatamp_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatamp),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -825,9 +827,9 @@ static PyObject *keydatastr_pynew(PyTypeObject *ty,
   char *p;
   unsigned f = 0;
   keydata_pyobj *me = 0;
-  static char *kwlist[] = { "key", "flags", 0 };
+  static const char *const kwlist[] = { "key", "flags", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:new", KWLIST,
 				   &p, convflags, &f))
     goto end;
   me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
@@ -839,9 +841,9 @@ end:
 static PyObject *kdsget_str(PyObject *me, void *hunoz)
   { return (PyString_FromString(KEYDATA_KD(me)->u.p)); }
 
-static PyGetSetDef keydatastr_pygetset[] = {
+static const PyGetSetDef keydatastr_pygetset[] = {
 #define GETSETNAME(op, name) kds##op##_##name
-  GET	(str,			"KD.str -> STRING")
+  GET	(str,		"KD.str -> STRING")
 #undef GETSETNAME
   { 0 }
 };
@@ -871,7 +873,7 @@ static PyTypeObject keydatastr_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataString(KEY, [flags = 0]): key data for string keys.",
+  "KeyDataString(KEY, [flags = 0]): key data for string keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -881,7 +883,7 @@ static PyTypeObject keydatastr_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatastr_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatastr),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -900,9 +902,9 @@ static PyObject *keydataec_pynew(PyTypeObject *ty,
   ec x = EC_INIT;
   unsigned f = 0;
   keydata_pyobj *me = 0;
-  static char *kwlist[] = { "key", "flags", 0 };
+  static const char *const kwlist[] = { "key", "flags", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
 				   convecpt, &x, convflags, &f))
     goto end;
   me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
@@ -919,9 +921,9 @@ static PyObject *kdeget_ecpt(PyObject *me, void *hunoz)
   return (ecpt_pywrapout(ecpt_pytype, &pt));
 }
 
-static PyGetSetDef keydataec_pygetset[] = {
+static const PyGetSetDef keydataec_pygetset[] = {
 #define GETSETNAME(op, name) kde##op##_##name
-  GET	(ecpt,			"KD.ecpt -> ECPT")
+  GET	(ecpt,		"KD.ecpt -> ECPT")
 #undef GETSETNAME
   { 0 }
 };
@@ -951,7 +953,7 @@ static PyTypeObject keydataec_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataECPt(KEY, [flags = 0]): key data for elliptic-curve keys.",
+  "KeyDataECPt(KEY, [flags = 0]): key data for elliptic-curve keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -961,7 +963,7 @@ static PyTypeObject keydataec_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydataec_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydataec),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1022,7 +1024,7 @@ static PyTypeObject subkeyiter_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Iterator for structured keys.",
+  "Iterator for structured keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1053,10 +1055,10 @@ static PyObject *keydatastruct_pynew(PyTypeObject *ty,
   char *p;
   keydata_pyobj *me = 0;
   key_data *kd = 0;
-  static char *kwlist[] = { "subkeys", 0 };
+  static const char *const kwlist[] = { "subkeys", 0 };
 
   Py_XINCREF(arg); Py_XINCREF(kw);
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:new", kwlist, &sub))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:new", KWLIST, &sub))
     goto end;
   kd = key_newstruct();
   if (sub) {
@@ -1096,7 +1098,7 @@ static PyObject *keydatastruct_pylookup(PyObject *me, PyObject *key)
   if ((tag = PyString_AsString(key)) == 0)
     goto end;
   if ((kd = key_structfind(KEYDATA_KD(me), tag)) == 0)
-    INDEXERR(key);
+    MAPERR(key);
   key_incref(kd);
   rc = keydata_pywrap(kd);
 end:
@@ -1118,7 +1120,7 @@ static int keydatastruct_pystore(PyObject *me,
     key_structset(KEYDATA_KD(me), tag, KEYDATA_KD(value));
   } else {
     if (!key_structfind(KEYDATA_KD(me), tag))
-      INDEXERR(key);
+      MAPERR(key);
     key_structset(KEYDATA_KD(me), tag, 0);
   }
   rc = 0;
@@ -1126,7 +1128,7 @@ end:
   return (rc);
 }
 
-static PyMappingMethods keydatastruct_pymapping = {
+static const PyMappingMethods keydatastruct_pymapping = {
   gmap_pysize,				/* @mp_length@ */
   keydatastruct_pylookup,		/* @mp_subscript@ */
   keydatastruct_pystore			/* @mp_ass_subscript@ */
@@ -1146,7 +1148,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
   0,					/* @tp_as_sequence@ */
-  &keydatastruct_pymapping,		/* @tp_as_mapping@ */
+  PYMAPPING(keydatastruct),		/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -1157,7 +1159,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyDataStructured([subkeys = []]): key data for structured keys.",
+  "KeyDataStructured([subkeys = []]): key data for structured keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1165,7 +1167,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   subkeyiter_make,			/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gmap_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gmap),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -1233,7 +1235,7 @@ static PyTypeObject keyattriter_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Iterator for key attributes.",
+  "Iterator for key attributes.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1265,7 +1267,7 @@ static PyObject *keyattrs_pylookup(PyObject *me, PyObject *key)
   if ((attr = PyString_AsString(key)) == 0)
     goto end;
   if ((value = key_getattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr)) == 0)
-    INDEXERR(key);
+    MAPERR(key);
   rc = PyString_FromString(value);
 end:
   return (rc);
@@ -1289,7 +1291,7 @@ static int keyattrs_pystore(PyObject *me,
       KEYERR(err);
   } else {
     if (!key_getattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr))
-      INDEXERR(key);
+      MAPERR(key);
     if ((err = key_putattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr, 0)) != 0)
       KEYERR(err);
   }
@@ -1312,7 +1314,7 @@ static void keyattrs_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static PyMappingMethods keyattrs_pymapping = {
+static const PyMappingMethods keyattrs_pymapping = {
   gmap_pysize,				/* @mp_length@ */
   keyattrs_pylookup,			/* @mp_subscript@ */
   keyattrs_pystore			/* @mp_ass_subscript@ */
@@ -1331,8 +1333,8 @@ static PyTypeObject keyattrs_pytype_skel = {
   0,					/* @tp_compare@ */
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
-  &gmap_pysequence,			/* @tp_as_sequence@ */
-  &keyattrs_pymapping,			/* @tp_as_mapping@ */
+  PYSEQUENCE(gmap),			/* @tp_as_sequence@ */
+  PYMAPPING(keyattrs),			/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -1343,7 +1345,7 @@ static PyTypeObject keyattrs_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Proxy thing for talking about key attributes.",
+  "Proxy thing for talking about key attributes.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1351,7 +1353,7 @@ static PyTypeObject keyattrs_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   keyattriter_make,			/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gmap_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gmap),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -1386,11 +1388,12 @@ static PyObject *key_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   uint32 id;
   char *type;
   unsigned long exptime = KEXP_FOREVER;
-  static char *kwlist[] = { "keyfile", "id", "type", "exptime", 0 };
+  static const char *const kwlist[] =
+    { "keyfile", "id", "type", "exptime", 0 };
   key *k;
   int err;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&s|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&s|O&:new", KWLIST,
 				   keyfile_pytype, &kfobj, convu32, &id,
 				   &type, convulong, &exptime))
     goto end;
@@ -1448,9 +1451,9 @@ static PyObject *kmeth_extract(PyObject *me, PyObject *arg, PyObject *kw)
   PyObject *nameobj;
   char *name;
   FILE *fp;
-  static char *kwlist[] = { "file", "filter", 0 };
+  static const char *const kwlist[] = { "file", "filter", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:extract", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:extract", KWLIST,
 				   &PyFile_Type, &file,
 				   convfilter, &f) ||
       (fp = PyFile_AsFile(file)) == 0 ||
@@ -1469,9 +1472,9 @@ static PyObject *kmeth_fingerprint(PyObject *me,
 {
   ghash *h;
   key_filter f = { KF_NONSECRET, KF_NONSECRET };
-  static char *kwlist[] = { "hash", "filter", 0 };
+  static const char *const kwlist[] = { "hash", "filter", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:fingerprint", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:fingerprint", KWLIST,
 				   convghash, &h, convfilter, &f))
     return (0);
   return (getbool(key_fingerprint(KEY_K(me), h, &f)));
@@ -1497,6 +1500,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 +1517,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)
@@ -1592,18 +1597,18 @@ end:
   return (-1);
 }
 
-static PyMethodDef key_pymethods[] = {
+static const PyMethodDef key_pymethods[] = {
 #define METHNAME(func) kmeth_##func
   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 }
 };
 
-static PyGetSetDef key_pygetset[] = {
+static const PyGetSetDef key_pygetset[] = {
 #define GETSETNAME(op, name) k##op##_##name
   GET	(file,		"KEY.file -> KF")
   GET	(id,		"KEY.id -> ID")
@@ -1645,7 +1650,7 @@ static PyTypeObject key_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key(KF, ID, TYPE, [exptime = KEXP_FOREVER]): key object.",
+  "Key(KF, ID, TYPE, [exptime = KEXP_FOREVER]): key object.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1653,9 +1658,9 @@ static PyTypeObject key_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  key_pymethods,			/* @tp_methods@ */
+  PYMETHODS(key),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  key_pygetset,				/* @tp_getset@ */
+  PYGETSET(key),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1719,7 +1724,7 @@ static PyTypeObject keyiter_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Keyring iterator.",
+  "Keyring iterator.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1773,10 +1778,10 @@ static PyObject *keyfile_pynew(PyTypeObject *ty,
   char *file = 0;
   unsigned how = KOPEN_READ;
   keyfile_pyobj *rc = 0;
-  static char *kwlist[] = { "file", "how", "report", 0 };
+  static const char *const kwlist[] = { "file", "how", "report", 0 };
 
   Py_XINCREF(arg); Py_XINCREF(kw);
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|iO:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|iO:new", KWLIST,
 				   &file, &how, &ri.func))
     goto end;
   if (ri.func && !PyCallable_Check(ri.func))
@@ -1832,10 +1837,10 @@ static PyObject *kfmeth_merge(PyObject *me, PyObject *arg, PyObject *kw)
   PyObject *x = 0;
   FILE *fp = 0;
   int rc;
-  static char *kwlist[] = { "file", "report", 0 };
+  static const char *const kwlist[] = { "file", "report", 0 };
 
   Py_XINCREF(arg); Py_XINCREF(kw);
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O:merge", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O:merge", KWLIST,
 				   &PyFile_Type, &x, &ri.func))
     goto end;
   if (ri.func && !PyCallable_Check(ri.func))
@@ -1920,7 +1925,7 @@ static PyObject *keyfile_pylookup(PyObject *me, PyObject *key)
   if (rc == Py_None) {
     Py_DECREF(rc);
     rc = 0;
-    INDEXERR(key);
+    MAPERR(key);
   }
 end:
   return (rc);
@@ -1931,11 +1936,11 @@ static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw)
   uint32 id;
   char *type;
   long exptime = KEXP_FOREVER;
-  static char *kwlist[] = { "id", "type", "exptime", 0 };
+  static const char *const kwlist[] = { "id", "type", "exptime", 0 };
   key *k;
   int err;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&s|l:newkey", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&s|l:newkey", KWLIST,
 				   convu32, &id, &type, &exptime))
     goto end;
   if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) != 0)
@@ -1953,9 +1958,9 @@ static PyObject *kfmeth_qtag(PyObject *me, PyObject *arg, PyObject *kw)
   char *tag;
   dstr d = DSTR_INIT;
   PyObject *rc = 0;
-  static char *kwlist[] = { "tag", "new", 0 };
+  static const char *const kwlist[] = { "tag", "new", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O!:qtag", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O!:qtag", KWLIST,
 				   &tag, keydata_pytype, &newkdobj))
     goto end;
   if (key_qtag(KEYFILE_KF(me), tag, &d, &k, &kd))
@@ -1985,21 +1990,22 @@ static PyObject *kfget_writep(PyObject *me, void *hunoz)
 static PyObject *kfget_filep(PyObject *me, void *hunoz)
   { return (getbool(!!KEYFILE_KF(me)->fp)); }
 
-static PyMethodDef keyfile_pymethods[] = {
+static const 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 }
 };
 
-static PyGetSetDef keyfile_pygetset[] = {
+static const PyGetSetDef keyfile_pygetset[] = {
 #define GETSETNAME(op, name) kf##op##_##name
   GET	(name,		"KF.name -> file name")
   GET	(modifiedp,	"KF.modifiedp -> has keyring been modified?")
@@ -2009,7 +2015,7 @@ static PyGetSetDef keyfile_pygetset[] = {
   { 0 }
 };
 
-static PyMappingMethods keyfile_pymapping = {
+static const PyMappingMethods keyfile_pymapping = {
   gmap_pysize,
   keyfile_pylookup,
   0
@@ -2028,8 +2034,8 @@ static PyTypeObject keyfile_pytype_skel = {
   0,					/* @tp_compare@ */
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
-  &gmap_pysequence,			/* @tp_as_sequence@ */
-  &keyfile_pymapping,			/* @tp_as_mapping@ */
+  PYSEQUENCE(gmap),			/* @tp_as_sequence@ */
+  PYMAPPING(keyfile),			/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -2040,8 +2046,8 @@ static PyTypeObject keyfile_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KeyFile(FILE, [how = KOPEN_READ], [report = ?]): Keyring file.\n\
-   calls REPORT(FILE, LINE, MSG) on problems",
+  "KeyFile(FILE, [how = KOPEN_READ], [report = ?]): Keyring file.\n"
+  "   calls REPORT(FILE, LINE, MSG) on problems",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2049,9 +2055,9 @@ static PyTypeObject keyfile_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   keyiter_new,				/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keyfile_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keyfile),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keyfile_pygetset,			/* @tp_getset@ */
+  PYGETSET(keyfile),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2066,24 +2072,13 @@ static PyTypeObject keyfile_pytype_skel = {
 
 /*----- Global stuff ------------------------------------------------------*/
 
-static PyObject *meth_barf(PyObject *me, PyObject *arg)
-{
-  int err;
-
-  if (PyArg_ParseTuple(arg, "i:barf", &err))
-    KEYERR(err);
-end:
-  return (0);
-}
-
 static PyMethodDef methods[] = {
 #define METHNAME(func) meth_##func
-  METH	(_KeyData_readflags,
-	   "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.decode(BYTES) -> KD")
-  METH	(barf,			"barf(ERR)")
+  METH	(_KeyData_readflags, "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.decode(BYTES) -> KD")
 #undef METHNAME
   { 0 }
 };