[Python-checkins] r58579 - python/trunk/Doc/library/inspect.rst
georg.brandl
python-checkins at python.org
Sun Oct 21 12:32:54 CEST 2007
Author: georg.brandl
Date: Sun Oct 21 12:32:54 2007
New Revision: 58579
Modified:
python/trunk/Doc/library/inspect.rst
Log:
Add markup to new function descriptions.
Modified: python/trunk/Doc/library/inspect.rst
==============================================================================
--- python/trunk/Doc/library/inspect.rst (original)
+++ python/trunk/Doc/library/inspect.rst Sun Oct 21 12:32:54 2007
@@ -265,30 +265,31 @@
.. function:: ismethoddescriptor(object)
- Return true if the object is a method descriptor, but not if ismethod() or
- isclass() or isfunction() are true.
+ Return true if the object is a method descriptor, but not if :func:`ismethod`
+ or :func:`isclass` or :func:`isfunction` are true.
- This is new as of Python 2.2, and, for example, is true of int.__add__. An
- object passing this test has a __get__ attribute but not a __set__ attribute,
- but beyond that the set of attributes varies. __name__ is usually sensible, and
- __doc__ often is.
-
- Methods implemented via descriptors that also pass one of the other tests return
- false from the ismethoddescriptor() test, simply because the other tests promise
- more -- you can, e.g., count on having the im_func attribute (etc) when an
- object passes ismethod().
+ This is new as of Python 2.2, and, for example, is true of
+ ``int.__add__``. An object passing this test has a :attr:`__get__` attribute
+ but not a :attr:`__set__` attribute, but beyond that the set of attributes
+ varies. :attr:`__name__` is usually sensible, and :attr:`__doc__` often is.
+
+ Methods implemented via descriptors that also pass one of the other tests
+ return false from the :func:`ismethoddescriptor` test, simply because the
+ other tests promise more -- you can, e.g., count on having the
+ :attr:`im_func` attribute (etc) when an object passes :func:`ismethod`.
.. function:: isdatadescriptor(object)
Return true if the object is a data descriptor.
- Data descriptors have both a __get__ and a __set__ attribute. Examples are
- properties (defined in Python), getsets, and members. The latter two are
- defined in C and there are more specific tests available for those types, which
- is robust across Python implementations. Typically, data descriptors will also
- have __name__ and __doc__ attributes (properties, getsets, and members have both
- of these attributes), but this is not guaranteed.
+ Data descriptors have both a :attr:`__get__` and a :attr:`__set__` attribute.
+ Examples are properties (defined in Python), getsets, and members. The
+ latter two are defined in C and there are more specific tests available for
+ those types, which is robust across Python implementations. Typically, data
+ descriptors will also have :attr:`__name__` and :attr:`__doc__` attributes
+ (properties, getsets, and members have both of these attributes), but this is
+ not guaranteed.
.. versionadded:: 2.3
@@ -309,8 +310,8 @@
Return true if the object is a member descriptor.
Member descriptors are attributes defined in extension modules via
- ``PyMemberDef`` structures. For Python implementations without such types, this
- method will always return ``False``.
+ ``PyMemberDef`` structures. For Python implementations without such types,
+ this method will always return ``False``.
.. versionadded:: 2.5
More information about the Python-checkins
mailing list