diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-06-18 08:20:22 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-18 08:20:22 (GMT) |
commit | 2fec611a70ba862a4127b7656a6d98d48850c3af (patch) | |
tree | e8d3470232edc34a9e7adbe609f261150cc08b0c /Doc/library/functions.rst | |
parent | d91e676fd58a25420a3dc8705472dc6bf9ca46e2 (diff) | |
parent | bae5d81f5d1f388aad48c2ce1aee8682b157e1bd (diff) | |
download | cpython-2fec611a70ba862a4127b7656a6d98d48850c3af.zip cpython-2fec611a70ba862a4127b7656a6d98d48850c3af.tar.gz cpython-2fec611a70ba862a4127b7656a6d98d48850c3af.tar.bz2 |
Issue #24314: Merge doc links from 3.5
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r-- | Doc/library/functions.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 5757ca4..1f13afc 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -304,7 +304,7 @@ are always available. They are listed here in alphabetical order. :func:`dir` reports their attributes. If the object does not provide :meth:`__dir__`, the function tries its best to - gather information from the object's :attr:`__dict__` attribute, if defined, and + gather information from the object's :attr:`~object.__dict__` attribute, if defined, and from its type object. The resulting list is not necessarily complete, and may be inaccurate when the object has a custom :func:`__getattr__`. @@ -1449,7 +1449,7 @@ are always available. They are listed here in alphabetical order. With three arguments, return a new type object. This is essentially a dynamic form of the :keyword:`class` statement. The *name* string is the - class name and becomes the :attr:`~class.__name__` attribute; the *bases* + class name and becomes the :attr:`~definition.__name__` attribute; the *bases* tuple itemizes the base classes and becomes the :attr:`~class.__bases__` attribute; and the *dict* dictionary is the namespace containing definitions for class body and is copied to a standard dictionary to become the @@ -1467,11 +1467,11 @@ are always available. They are listed here in alphabetical order. .. function:: vars([object]) Return the :attr:`~object.__dict__` attribute for a module, class, instance, - or any other object with a :attr:`__dict__` attribute. + or any other object with a :attr:`~object.__dict__` attribute. - Objects such as modules and instances have an updateable :attr:`__dict__` + Objects such as modules and instances have an updateable :attr:`~object.__dict__` attribute; however, other objects may have write restrictions on their - :attr:`__dict__` attributes (for example, classes use a + :attr:`~object.__dict__` attributes (for example, classes use a dictproxy to prevent direct dictionary updates). Without an argument, :func:`vars` acts like :func:`locals`. Note, the |