Author: christian.heimes
Date: Fri Nov 30 23:29:24 2007
New Revision: 59248
Modified:
python/branches/py3k/Doc/c-api/concrete.rst
python/branches/py3k/Doc/library/types.rst
python/branches/py3k/Include/classobject.h
Log:
Cleanups and documentation updates related to the removal of unbound methods.
Modified: python/branches/py3k/Doc/c-api/concrete.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/concrete.rst (original)
+++ python/branches/py3k/Doc/c-api/concrete.rst Fri Nov 30 23:29:24 2007
@@ -2577,7 +2577,9 @@
.. index:: object: method
-There are some useful functions that are useful for working with method
objects.
+Methods are bound function objects. Methods are always bound to an instance of
+an user-defined class. Unbound methods (methods bound to a class object) are
+no longer available.
.. cvar:: PyTypeObject PyMethod_Type
@@ -2594,25 +2596,11 @@
parameter must not be *NULL*.
-.. cfunction:: PyObject* PyMethod_New(PyObject *func, PyObject *self, PyObject
*class)
+.. cfunction:: PyObject* PyMethod_New(PyObject *func, PyObject *self)
- Return a new method object, with *func* being any callable object; this is
the
- function that will be called when the method is called. If this method
should
- be bound to an instance, *self* should be the instance and *class* should
be the
- class of *self*, otherwise *self* should be *NULL* and *class* should be the
- class which provides the unbound method.
-
- .. XXX no unbound methods anymore...
-
-.. cfunction:: PyObject* PyMethod_Class(PyObject *meth)
-
- Return the class object from which the method *meth* was created; if this
was
- created from an instance, it will be the class of the instance.
-
-
-.. cfunction:: PyObject* PyMethod_GET_CLASS(PyObject *meth)
-
- Macro version of :cfunc:`PyMethod_Class` which avoids error checking.
+ Return a new method object, with *func* being any callable object and *self*
+ the instance the method should be bound. *func* is is the function that will
+ be called when the method is called. *self* must not be *NULL*.
.. cfunction:: PyObject* PyMethod_Function(PyObject *meth)
@@ -2627,8 +2615,7 @@
.. cfunction:: PyObject* PyMethod_Self(PyObject *meth)
- Return the instance associated with the method *meth* if it is bound,
otherwise
- return *NULL*.
+ Return the instance associated with the method *meth*.
.. cfunction:: PyObject* PyMethod_GET_SELF(PyObject *meth)
Modified: python/branches/py3k/Doc/library/types.rst
==============================================================================
--- python/branches/py3k/Doc/library/types.rst (original)
+++ python/branches/py3k/Doc/library/types.rst Fri Nov 30 23:29:24 2007
@@ -58,7 +58,6 @@
.. data:: MethodType
- UnboundMethdType
The type of methods of user-defined class instances.
Modified: python/branches/py3k/Include/classobject.h
==============================================================================
--- python/branches/py3k/Include/classobject.h (original)
+++ python/branches/py3k/Include/classobject.h Fri Nov 30 23:29:24 2007
@@ -23,7 +23,6 @@
PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *);
PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *);
/* Macros for direct access to these values. Type checks are *not*
done, so use with care. */
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
