util.c: Make `default' arguments optional in `get', `setdefault', `pop'.

[catacomb-python] / util.c

diff --git a/util.c b/util.c
index 231e00a55afa7e6101abfbdce67a211bd0199e92..d613a7a4b1f6cc11d1df64614136e57aaa0672fc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -742,7 +742,7 @@ PyObject *gmapmeth_get(PyObject *me, PyObject *arg, PyObject *kw)
 {
   PyObject *k, *def = Py_None, *v;
 
 {
   PyObject *k, *def = Py_None, *v;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO:get", def_kwlist, &k, &def))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:get", def_kwlist, &k, &def))

     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) return (v);
   PyErr_Clear();
     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) return (v);
   PyErr_Clear();


@@ -753,7 +753,7 @@ PyObject *gmapmeth_setdefault(PyObject *me, PyObject *arg, PyObject *kw)
 {
   PyObject *k, *def = Py_None, *v;
 
 {
   PyObject *k, *def = Py_None, *v;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO:setdefault",
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:setdefault",

                                   def_kwlist, &k, &def))
     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) return (v);
                                   def_kwlist, &k, &def))
     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) return (v);


@@ -766,14 +766,16 @@ PyObject *gmapmeth_pop(PyObject *me, PyObject *arg, PyObject *kw)
 {
   PyObject *k, *def = 0, *v;
 
 {
   PyObject *k, *def = 0, *v;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO:pop", def_kwlist, &k, &def))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:pop", def_kwlist, &k, &def))

     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) {
     PyObject_DelItem(me, k);
     return (v);
     return (0);
   if ((v = PyObject_GetItem(me, k)) != 0) {
     PyObject_DelItem(me, k);
     return (v);

-  }
-  PyErr_Clear();
-  RETURN_OBJ(def);
+  } else if (def) {
+    PyErr_Clear();
+    RETURN_OBJ(def);
+  } else
+    return (0);

 }
 
 PyObject *gmapmeth_update(PyObject *me, PyObject *arg)
 }
 
 PyObject *gmapmeth_update(PyObject *me, PyObject *arg)