diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 09:33:55 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 09:33:55 +0000 |
| commit | db235c1c941e51b2eb36ea605f1999b7c6d0ffaf (patch) | |
| tree | ca6466ade1c640e14badab35a096bb6eccfb6f6d | |
| parent | 0930228aee0fd70066b5d7fe6afd41c2bce0dca6 (diff) | |
| download | cpython-git-db235c1c941e51b2eb36ea605f1999b7c6d0ffaf.tar.gz | |
Merged revisions 85008,85011,85240 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85008 | georg.brandl | 2010-09-25 15:30:03 +0200 (Sa, 25 Sep 2010) | 1 line
#9944: fix typo.
........
r85011 | georg.brandl | 2010-09-25 18:56:36 +0200 (Sa, 25 Sep 2010) | 1 line
#9562: slight clarification.
........
r85240 | georg.brandl | 2010-10-06 07:08:32 +0200 (Mi, 06 Okt 2010) | 1 line
#10034: import readline in longer example.
........
| -rw-r--r-- | Doc/library/itertools.rst | 2 | ||||
| -rw-r--r-- | Doc/library/readline.rst | 1 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index d25819b4e3..de464628a8 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -677,7 +677,7 @@ which incur interpreter overhead. # feed the entire iterator into a zero-length deque collections.deque(iterator, maxlen=0) else: - # advance to the emtpy slice starting at position n + # advance to the empty slice starting at position n next(islice(iterator, n, n), None) def nth(iterable, n, default=None): diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst index 9a7e940646..f6e855e295 100644 --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -210,6 +210,7 @@ normally be executed automatically during interactive sessions from the user's :envvar:`PYTHONSTARTUP` file. :: import os + import readline histfile = os.path.join(os.environ["HOME"], ".pyhist") try: readline.read_history_file(histfile) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 2862104826..8dc36bc900 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2101,7 +2101,7 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: existing keys. Return ``None``. :func:`update` accepts either another dictionary object or an iterable of - key/value pairs (as a tuple or other iterable of length two). If keyword + key/value pairs (as tuples or other iterables of length two). If keyword arguments are specified, the dictionary is then updated with those key/value pairs: ``d.update(red=1, blue=2)``. |