Merged revisions 80030 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80030 | georg.brandl | 2010-04-13 08:43:54 +0200 (Di, 13 Apr 2010) | 1 line
Get rid of multi-row cells.
........
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 3ec7840..3cc437f 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -323,16 +323,16 @@
This chart summarizes the binding and its two most useful variants:
- +-----------------+--------------+----------------------+------------------+
- | Transformation | | Called from an | Called from a |
- | | | Object | Class |
- +=================+==============+======================+==================+
- | | function | f(obj, \*args) | f(\*args) |
- + +--------------+----------------------+------------------+
- | Descriptor | staticmethod | f(\*args) | f(\*args) |
- + +--------------+----------------------+------------------+
- | | classmethod | f(type(obj), \*args) | f(klass, \*args) |
- +-----------------+--------------+----------------------+------------------+
+ +-----------------+----------------------+------------------+
+ | Transformation | Called from an | Called from a |
+ | | Object | Class |
+ +=================+======================+==================+
+ | function | f(obj, \*args) | f(\*args) |
+ +-----------------+----------------------+------------------+
+ | staticmethod | f(\*args) | f(\*args) |
+ +-----------------+----------------------+------------------+
+ | classmethod | f(type(obj), \*args) | f(klass, \*args) |
+ +-----------------+----------------------+------------------+
Static methods return the underlying function without changes. Calling either
``c.f`` or ``C.f`` is the equivalent of a direct lookup into