Add docs for __func__ and __self__ on methods.

diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 92c3ef946a797fd8490a916704dc52c19ec08cd3..4ee68f635590bec3a8efd50b816ada2cebac435e 100644 (file)
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -54,12 +54,12 @@ attributes:
 |           | im_class        | class object that asked   | \(1)  |
 |           |                 | for this method           |       |
 +-----------+-----------------+---------------------------+-------+
-|           | im_func         | function object           |       |
-|           |                 | containing implementation |       |
+|           | im_func or      | function object           |       |
+|           | __func__        | containing implementation |       |
 |           |                 | of method                 |       |
 +-----------+-----------------+---------------------------+-------+
-|           | im_self         | instance to which this    |       |
-|           |                 | method is bound, or       |       |
+|           | im_self or      | instance to which this    |       |
+|           | __self__        | method is bound, or       |       |
 |           |                 | ``None``                  |       |
 +-----------+-----------------+---------------------------+-------+
 | function  | __doc__         | documentation string      |       |

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 8ae94af343d1eb86bb6274e38d75bfc06ed09766..cc714203e5fd05aea4e30bc7044d672b2cef8288 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -555,6 +555,10 @@ Callable types
       .. versionchanged:: 2.2
          :attr:`im_self` used to refer to the class that defined the method.
 
+      .. versionchanged:: 2.6
+         For 3.0 forward-compatibility, :attr:`im_func` is also available as
+         :attr:`__func__`, and :attr:`im_self` as :attr:`__self__`.
+
       .. index::
          single: __doc__ (method attribute)
          single: __name__ (method attribute)