[pywin32-checkins] pywin32/Pythonwin win32assoc.cpp,1.6,1.7

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14240

Modified Files:
	win32assoc.cpp 
Log Message:
Change the wording of that obscure "existing object not the same type"
error, and include the names of the types involved.


Index: win32assoc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32assoc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32assoc.cpp	7 Sep 2004 02:26:20 -0000	1.6
--- win32assoc.cpp	12 Apr 2005 06:02:34 -0000	1.7
***************
*** 267,272 ****
  		ret = (ui_assoc_object*) handleMgr.GetAssocObject(search);
  	if (ret) {
! 		if (!ret->is_uiobject(&makeType))
! 			RETURN_ERR("Internal error - existing object is not of same type as requested new object");
  		DOINCREF( ret );
  		return ret;
--- 267,276 ----
  		ret = (ui_assoc_object*) handleMgr.GetAssocObject(search);
  	if (ret) {
! 		if (!ret->is_uiobject(&makeType)) {
! 			PyErr_Format(ui_module_error,
! 			             "Internal error - existing object has type '%s', but '%s' was requested.",
! 			             ret->ob_type->tp_name, makeType.tp_name);
! 			return NULL;
! 		}
  		DOINCREF( ret );
  		return ret;