Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.2: link to mapping glossary entry in docs.

This commit is contained in:
Chris Jerdonek 2012-11-03 12:06:42 -07:00
parent 68600aff3a 11f3f172e7
commit 1c8bb9f4d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/os.rst
View File

@ -105,7 +105,7 @@ process and user.
.. data:: environ
A mapping object representing the string environment. For example,
A :term:`mapping` object representing the string environment. For example,
``environ['HOME']`` is the pathname of your home directory (on some platforms),
and is equivalent to ``getenv("HOME")`` in C.
@ -145,7 +145,7 @@ process and user.
.. data:: environb
Bytes version of :data:`environ`: a mapping object representing the
Bytes version of :data:`environ`: a :term:`mapping` object representing the
environment as byte strings. :data:`environ` and :data:`environb` are
synchronized (modify :data:`environb` updates :data:`environ`, and vice
versa).

2
Doc/library/stdtypes.rst
View File

@ -2928,7 +2928,7 @@ Mapping Types --- :class:`dict`
statement: del
builtin: len
A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
Mappings are mutable objects. There is currently only one standard mapping
type, the :dfn:`dictionary`. (For other containers see the built-in
:class:`list`, :class:`set`, and :class:`tuple` classes, and the