Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17638
Modified Files:
Tag: py3k
win32assoc.cpp
Log Message:
Re-enable printing of python instance in ui_assoc_object::repr
Index: win32assoc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32assoc.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** win32assoc.cpp 29 Aug 2008 05:53:29 -0000 1.9.2.1
--- win32assoc.cpp 5 Sep 2008 07:12:35 -0000 1.9.2.2
***************
*** 298,308 ****
if (virtualInst == NULL)
py_repr=no_repr;
! else
! py_repr=_T("??? some object ???");
! // else{
! /* PyObject_Repr or PyObject_Str will cause an infinite loop here, since subclasses will inherit
! *this* repr if they don't define __repr__,
! */
! /*
PyObject *vi_repr=PyObject_Str(virtualInst);
if (vi_repr==NULL || !PyWinObject_AsTCHAR(vi_repr, &py_repr, FALSE)){
--- 298,302 ----
if (virtualInst == NULL)
py_repr=no_repr;
! else{
PyObject *vi_repr=PyObject_Str(virtualInst);
if (vi_repr==NULL || !PyWinObject_AsTCHAR(vi_repr, &py_repr, FALSE)){
***************
*** 314,318 ****
Py_XDECREF(vi_repr);
}
- */
csRet.Format(_T(" - assoc is %p, vi=%s"), assoc, py_repr);
if (bfree_repr)
--- 308,311 ----
|
