summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-24 06:12:20 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-06-24 06:12:20 (GMT)
commit69da9c43431a107f4386d18d18cf08725b3659e6 (patch)
treed8b8cf1c843548294dd317d7eb9646926f7938f7 /Doc/library/functions.rst
parent7577ad32d15244bf1fd6594e42bf9ea10e9998bb (diff)
parent37e87e6ec116b0e0e41e9623eec2743c78d96b5c (diff)
downloadcpython-69da9c43431a107f4386d18d18cf08725b3659e6.zip
cpython-69da9c43431a107f4386d18d18cf08725b3659e6.tar.gz
cpython-69da9c43431a107f4386d18d18cf08725b3659e6.tar.bz2
Issue #26547: Merge from 3.5
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 1f13afc..7216f1d 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1472,7 +1472,7 @@ are always available. They are listed here in alphabetical order.
Objects such as modules and instances have an updateable :attr:`~object.__dict__`
attribute; however, other objects may have write restrictions on their
:attr:`~object.__dict__` attributes (for example, classes use a
- dictproxy to prevent direct dictionary updates).
+ :class:`types.MappingProxyType` to prevent direct dictionary updates).
Without an argument, :func:`vars` acts like :func:`locals`. Note, the
locals dictionary is only useful for reads since updates to the locals