aboutsummaryrefslogtreecommitdiff
path: root/Doc/howto
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-04-13 06:43:54 +0000
committerGeorg Brandl <georg@python.org>2010-04-13 06:43:54 +0000
commitd0731072a9b34603e6cec0299008d46a8cbf0059 (patch)
tree754d2b62ab958b41e4c8664d73112a4d6fd73932 /Doc/howto
parentFix #7306. Add skips to test_winsound when no default sound is configured. (diff)
downloadcpython-d0731072a9b34603e6cec0299008d46a8cbf0059.tar.gz
cpython-d0731072a9b34603e6cec0299008d46a8cbf0059.tar.bz2
cpython-d0731072a9b34603e6cec0299008d46a8cbf0059.zip
Get rid of multi-row cells.
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/descriptor.rst20
1 files changed, 10 insertions, 10 deletions
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 3ec784023f6..3cc437ff8bd 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -323,16 +323,16 @@ becomes ``f(*args)``.
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