From: Georg Brandl Date: Tue, 13 Apr 2010 06:43:54 +0000 (+0000) Subject: Get rid of multi-row cells. X-Git-Tag: v2.7b2~289 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0731072a9b34603e6cec0299008d46a8cbf0059;p=python Get rid of multi-row cells. --- diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst index 3ec784023f..3cc437ff8b 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