Better error message when non-dictionary received for **kwarg

diff --git a/Python/getargs.c b/Python/getargs.c
index 5a9418380b6dd33c225422c066da4f034259af51..aa4a22828d26d947d7ea3ae4e2d472898ebd5ae9 100644 (file)
--- 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);