[Python-checkins] CVS: python/dist/src/Include methodobject.h,2.23,2.24

[Fred L. Drake]

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

Modified Files:
	methodobject.h 
Log Message:
Introduce two new flag bits that can be set in a PyMethodDef method
descriptor, as used for the tp_methods slot of a type.  These new flag
bits are both optional, and mutually exclusive.  Most methods will not
use either.  These flags are used to create special method types which
exist in the same namespace as normal methods without having to use
tedious construction code to insert the new special method objects in
the type's tp_dict after PyType_Ready() has been called.

If METH_CLASS is specified, the method will represent a class method
like that returned by the classmethod() built-in.

If METH_STATIC is specified, the method will represent a static method
like that returned by the staticmethod() built-in.

These flags may not be used in the PyMethodDef table for modules since
these special method types are not meaningful in that case; a
ValueError will be raised if these flags are found in that context.


Index: methodobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/methodobject.h,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -d -r2.23 -r2.24
*** methodobject.h	12 Aug 2001 21:51:00 -0000	2.23
--- methodobject.h	28 Mar 2002 05:33:33 -0000	2.24
***************
*** 47,53 ****
  #define METH_VARARGS  0x0001
  #define METH_KEYWORDS 0x0002
! /* METH_NOARGS and METH_O must not be combined with any other flag. */
  #define METH_NOARGS   0x0004
  #define METH_O        0x0008
  
  typedef struct PyMethodChain {
--- 47,59 ----
  #define METH_VARARGS  0x0001
  #define METH_KEYWORDS 0x0002
! /* METH_NOARGS and METH_O must not be combined with the flags above. */
  #define METH_NOARGS   0x0004
  #define METH_O        0x0008
+ 
+ /* METH_CLASS and METH_STATIC are a little different; these control
+    the construction of methods for a class.  These cannot be used for
+    functions in modules. */
+ #define METH_CLASS    0x0010
+ #define METH_STATIC   0x0020
  
  typedef struct PyMethodChain {