traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Georg Brandl 2010-04-18 09:31:55 +00:00
parent ddc3ddd577
commit 3185c27453
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Doc/howto/descriptor.rst
View File

@ -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