[Python-checkins] python/dist/src/Objects weakrefobject.c,1.12,1.13

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Mon, 14 Jul 2003 14:46:25 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv9803

Modified Files:
	weakrefobject.c 
Log Message:
Remove proxy_print(), since that caused an inconsistency between
"print repr(proxy(a))" and "proxy(a)" at an interactive prompt.
Closes SF bug #722763.


Index: weakrefobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/weakrefobject.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** weakrefobject.c	30 Jun 2003 04:18:48 -0000	1.12
--- weakrefobject.c	14 Jul 2003 21:46:23 -0000	1.13
***************
*** 265,276 ****
  WRAP_TERNARY(proxy_call, PyEval_CallObjectWithKeywords)
  
- static int
- proxy_print(PyWeakReference *proxy, FILE *fp, int flags)
- {
-     if (!proxy_checkref(proxy))
-         return -1;
-     return PyObject_Print(PyWeakref_GET_OBJECT(proxy), fp, flags);
- }
- 
  static PyObject *
  proxy_repr(PyWeakReference *proxy)
--- 265,268 ----
***************
*** 480,484 ****
      /* methods */
      (destructor)weakref_dealloc,        /* tp_dealloc */
!     (printfunc)proxy_print,             /* tp_print */
      0,				        /* tp_getattr */
      0, 				        /* tp_setattr */
--- 472,476 ----
      /* methods */
      (destructor)weakref_dealloc,        /* tp_dealloc */
!     0,				        /* tp_print */
      0,				        /* tp_getattr */
      0, 				        /* tp_setattr */
***************
*** 515,519 ****
      /* methods */
      (destructor)weakref_dealloc,        /* tp_dealloc */
!     (printfunc)proxy_print,             /* tp_print */
      0,				        /* tp_getattr */
      0, 				        /* tp_setattr */
--- 507,511 ----
      /* methods */
      (destructor)weakref_dealloc,        /* tp_dealloc */
!     0,				        /* tp_print */
      0,				        /* tp_getattr */
      0, 				        /* tp_setattr */