From: Fred Drake <fdrake@acm.org>
Date: Wed, 23 Feb 2000 15:47:16 +0000 (+0000)
Subject: dict_has_key():  Accept only one parameter.  PR#210 reported by
X-Git-Tag: v1.6a1~368
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52fccfda5bc4324b046dc726f744163d961f8f10;p=thirdparty%2FPython%2Fcpython.git

dict_has_key():  Accept only one parameter.  PR#210 reported by
                 Andreas Jung <ajung@sz-sb.de>.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 22c413510911..ceec39da0ed3 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -959,7 +959,7 @@ dict_has_key(mp, args)
 	PyObject *key;
 	long hash;
 	register long ok;
-	if (!PyArg_Parse(args, "O", &key))
+	if (!PyArg_ParseTuple(args, "O:has_key", &key))
 		return NULL;
 #ifdef CACHE_HASH
 	if (!PyString_Check(key) ||
@@ -984,7 +984,7 @@ dict_get(mp, args)
 	PyObject *val = NULL;
 	long hash;
 
-	if (!PyArg_ParseTuple(args, "O|O", &key, &failobj))
+	if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
 		return NULL;
 	if (mp->ma_table == NULL)
 		goto finally;
@@ -1021,14 +1021,14 @@ dict_clear(mp, args)
 }
 
 static PyMethodDef mapp_methods[] = {
-	{"has_key",	(PyCFunction)dict_has_key},
+	{"has_key",	(PyCFunction)dict_has_key,      METH_VARARGS},
 	{"keys",	(PyCFunction)dict_keys},
 	{"items",	(PyCFunction)dict_items},
 	{"values",	(PyCFunction)dict_values},
 	{"update",	(PyCFunction)dict_update},
 	{"clear",	(PyCFunction)dict_clear},
 	{"copy",	(PyCFunction)dict_copy},
-	{"get",         (PyCFunction)dict_get, 1},
+	{"get",         (PyCFunction)dict_get,          METH_VARARGS},
 	{NULL,		NULL}		/* sentinel */
 };