[Stackless-checkins] CVS: slpdev/src/2.3/dev/Objects classobject.c, 1.15, 1.16 descrobject.c, 1.11, 1.12 funcobject.c, 1.9, 1.10 methodobject.c, 1.7, 1.8

Christian Tismer tismer at centera.de
Sun Apr 25 01:36:48 CEST 2004


Update of /home/cvs/slpdev/src/2.3/dev/Objects
In directory centera.de:/tmp/cvs-serv11129/Objects

Modified Files:
	classobject.c descrobject.c funcobject.c methodobject.c 
Log Message:
some more refinements according to PEP 7

Index: classobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/classobject.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** classobject.c	24 Apr 2004 03:42:41 -0000	1.15
--- classobject.c	24 Apr 2004 23:36:46 -0000	1.16
***************
*** 2488,2494 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL,/* tp_flags */
  #else
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
  #endif
  	instancemethod_doc,			/* tp_doc */
--- 2488,2495 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL,	/* tp_flags */
  #else
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
  #endif
  	instancemethod_doc,			/* tp_doc */

Index: descrobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/descrobject.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** descrobject.c	24 Apr 2004 23:29:39 -0000	1.11
--- descrobject.c	24 Apr 2004 23:36:46 -0000	1.12
***************
*** 424,428 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
--- 424,429 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
***************
*** 467,471 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
--- 468,473 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
***************
*** 585,589 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
--- 587,592 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
***************
*** 972,977 ****
  #define WRAP_RETURN(call) { \
  	PyObject * retval; \
! 	STACKLESS_PROMOTE_FLAG(wp->descr->d_base->flags & PyWrapperFlag_STACKLESS \
! 	  && wp->descr->d_type->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_CALL); \
  	retval = (call); \
  	STACKLESS_ASSERT(); \
--- 975,981 ----
  #define WRAP_RETURN(call) { \
  	PyObject * retval; \
! 	STACKLESS_PROMOTE_FLAG( \
! 		wp->descr->d_base->flags & PyWrapperFlag_STACKLESS && \
! 		wp->descr->d_type->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_CALL); \
  	retval = (call); \
  	STACKLESS_ASSERT(); \
***************
*** 1052,1056 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
--- 1056,1061 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */

Index: funcobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/funcobject.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** funcobject.c	24 Apr 2004 23:29:39 -0000	1.9
--- funcobject.c	24 Apr 2004 23:36:46 -0000	1.10
***************
*** 550,554 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL,/* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
--- 550,555 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL,/* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */

Index: methodobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/Objects/methodobject.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** methodobject.c	5 Apr 2004 14:47:13 -0000	1.7
--- methodobject.c	24 Apr 2004 23:36:46 -0000	1.8
***************
*** 282,286 ****
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_STACKLESS_CALL,/* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
--- 282,287 ----
  	0,					/* tp_as_buffer */
  #ifdef STACKLESS
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
! 		Py_TPFLAGS_HAVE_STACKLESS_CALL, /* tp_flags */
  #else
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins



More information about the Stackless-checkins mailing list