diff options
author | Christian Heimes <christian@cheimes.de> | 2007-11-27 10:40:20 +0000 |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2007-11-27 10:40:20 +0000 |
commit | fa2554d027a0ba6e5e9905703f33fa9457ff7063 (patch) | |
tree | ee147a943522dcf6b45f05991e1463581a4a0ba5 /Include/classobject.h | |
parent | 51110d3cf2224de661a63747768fa68d79beb107 (diff) | |
download | cpython-fa2554d027a0ba6e5e9905703f33fa9457ff7063.tar.gz |
Removed the API to create unbound methods and simplified the API for bound methods. The signature is PyMethod_New(func, instance).
Also removed im_class and renamed im_self to __self__ and im_func to __func__. im_class can be substituted with method.__self__.__class__.
I've also updated some parts of the documenation.
Diffstat (limited to 'Include/classobject.h')
-rw-r--r-- | Include/classobject.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Include/classobject.h b/Include/classobject.h index 885c43e4cf..e6ca421a5b 100644 --- a/Include/classobject.h +++ b/Include/classobject.h @@ -1,4 +1,4 @@ -/* Former class object interface -- now only (un)bound methods are here */ +/* Former class object interface -- now only bound methods are here */ /* Revealing some structures (not for general use) */ @@ -11,8 +11,7 @@ extern "C" { typedef struct { PyObject_HEAD PyObject *im_func; /* The callable object implementing the method */ - PyObject *im_self; /* The instance it is bound to, or NULL */ - PyObject *im_class; /* The class that asked for the method */ + PyObject *im_self; /* The instance it is bound to */ PyObject *im_weakreflist; /* List of weak references */ } PyMethodObject; @@ -20,7 +19,7 @@ PyAPI_DATA(PyTypeObject) PyMethod_Type; #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) -PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *); PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *); PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *); @@ -32,8 +31,6 @@ PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *); (((PyMethodObject *)meth) -> im_func) #define PyMethod_GET_SELF(meth) \ (((PyMethodObject *)meth) -> im_self) -#define PyMethod_GET_CLASS(meth) \ - (((PyMethodObject *)meth) -> im_class) #ifdef __cplusplus } |