diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 10:01:04 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 10:01:04 (GMT) |
| commit | 446977c080bc82f37b13d89f1de82cb1670caccf (patch) | |
| tree | e5c549cb36e366868b856bbfa96aabddec5948f5 | |
| parent | 848f2b595d19ba784535d1ae38beb7413b1d51cd (diff) | |
| parent | 85b8f45515a08afd75ca38b3760defabd219a632 (diff) | |
| download | cpython-446977c080bc82f37b13d89f1de82cb1670caccf.zip cpython-446977c080bc82f37b13d89f1de82cb1670caccf.tar.gz cpython-446977c080bc82f37b13d89f1de82cb1670caccf.tar.bz2 | |
Issue #25286: Merge dictionary view glossary from 3.4 into 3.5
| -rw-r--r-- | Doc/glossary.rst | 15 | ||||
| -rw-r--r-- | Doc/library/collections.abc.rst | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 846c01a..daaeb95 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -241,6 +241,14 @@ Glossary keys can be any object with :meth:`__hash__` and :meth:`__eq__` methods. Called a hash in Perl. + dictionary view + The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and + :meth:`dict.items` are called dictionary views. They provide a dynamic + view on the dictionary’s entries, which means that when the dictionary + changes, the view reflects these changes. To force the + dictionary view to become a full list use ``list(dictview)``. See + :ref:`dict-views`. + docstring A string literal which appears as the first expression in a class, function or module. While ignored when the suite is executed, it is @@ -934,13 +942,6 @@ Glossary ``'\r'``. See :pep:`278` and :pep:`3116`, as well as :func:`bytes.splitlines` for an additional use. - view - The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and - :meth:`dict.items` are called dictionary views. They are lazy sequences - that will see changes in the underlying dictionary. To force the - dictionary view to become a full list use ``list(dictview)``. See - :ref:`dict-views`. - virtual environment A cooperatively isolated runtime environment that allows Python users and applications to install and upgrade Python distribution packages diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index 563c1bc..d9b93ad 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -150,7 +150,7 @@ ABC Inherits from Abstract Methods Mixin KeysView ValuesView - ABCs for mapping, items, keys, and values :term:`views <view>`. + ABCs for mapping, items, keys, and values :term:`views <dictionary view>`. .. class:: Awaitable |