From a0ac40c530aea691ebeee3cb3935e6ab99cd1353 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Thu, 25 Jan 2001 20:13:10 +0000 Subject: Better error message when non-dictionary received for **kwarg --- Python/getargs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Python/getargs.c b/Python/getargs.c index 5a94183..aa4a228 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -1023,8 +1023,13 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format, if (keywords) { if (!PyDict_Check(keywords)) { - PyErr_SetString(PyExc_SystemError, - "non-dictionary object received when keyword dictionary expected"); + if (keywords == NULL) + PyErr_SetString(PyExc_SystemError, + "NULL received when keyword dictionary expected"); + else + PyErr_Format(PyExc_SystemError, + "%s received when keyword dictionary expected", + keywords->ob_type->tp_name); return 0; } kwlen = PyDict_Size(keywords); -- cgit v0.12