[Python-checkins] CVS: python/dist/src/Python getargs.c,2.52,2.53

[Jeremy Hylton]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv25676/Python

Modified Files:
	getargs.c 
Log Message:
Better error message when non-dictionary received for **kwarg


Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.52
retrieving revision 2.53
diff -C2 -r2.52 -r2.53
*** getargs.c	2001/01/15 22:14:16	2.52
--- getargs.c	2001/01/25 20:13:10	2.53
***************
*** 1024,1029 ****
  	if (keywords) { 	
  		if (!PyDict_Check(keywords)) {
! 			PyErr_SetString(PyExc_SystemError,
! 	  "non-dictionary object received when keyword dictionary expected");
  			return 0;
  		}	
--- 1024,1034 ----
  	if (keywords) { 	
  		if (!PyDict_Check(keywords)) {
! 			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;
  		}