mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 05:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 85008,85011,85240 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2010-10-06 09:33:55 +00:00
parent 0930228aee
commit db235c1c94
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/itertools.rst
View file

@ -677,7 +677,7 @@ which incur interpreter overhead.
# feed the entire iterator into a zero-length deque # feed the entire iterator into a zero-length deque
collections.deque(iterator, maxlen=0) collections.deque(iterator, maxlen=0)
else: 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) next(islice(iterator, n, n), None)
def nth(iterable, n, default=None): def nth(iterable, n, default=None):

1
Doc/library/readline.rst
View file

@ -210,6 +210,7 @@ normally be executed automatically during interactive sessions from the user's
:envvar:`PYTHONSTARTUP` file. :: :envvar:`PYTHONSTARTUP` file. ::
import os import os
import readline
histfile = os.path.join(os.environ["HOME"], ".pyhist") histfile = os.path.join(os.environ["HOME"], ".pyhist")
try: try:
readline.read_history_file(histfile) readline.read_history_file(histfile)

2
Doc/library/stdtypes.rst
View file

@ -2101,7 +2101,7 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
existing keys. Return ``None``. existing keys. Return ``None``.
:func:`update` accepts either another dictionary object or an iterable of :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 arguments are specified, the dictionary is then updated with those
key/value pairs: ``d.update(red=1, blue=2)``. key/value pairs: ``d.update(red=1, blue=2)``.