diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-06 13:58:24 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-06 13:58:24 (GMT) |
| commit | 5d8da20dd1034081906dbdffea9c77bf39353dec (patch) | |
| tree | 6774ab3df4ed626eaf5707c97ac122beb8ed189d /Doc | |
| parent | b91960c687a0a2f7ad4094441c20d834efeb2daf (diff) | |
| download | cpython-5d8da20dd1034081906dbdffea9c77bf39353dec.zip cpython-5d8da20dd1034081906dbdffea9c77bf39353dec.tar.gz cpython-5d8da20dd1034081906dbdffea9c77bf39353dec.tar.bz2 | |
Merged revisions 62713,62715,62728,62737,62740,62744,62749,62756 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62713 | georg.brandl | 2008-05-04 23:40:44 +0200 (Sun, 04 May 2008) | 2 lines
#2695: Do case-insensitive check for algorithms.
........
r62715 | benjamin.peterson | 2008-05-05 00:39:33 +0200 (Mon, 05 May 2008) | 2 lines
Remove method signatures from the docstrings of io.py
........
r62728 | martin.v.loewis | 2008-05-05 19:54:01 +0200 (Mon, 05 May 2008) | 2 lines
Revert bogus checkin in r62724 to that file.
........
r62737 | georg.brandl | 2008-05-05 22:59:05 +0200 (Mon, 05 May 2008) | 2 lines
#2769: markup glitch.
........
r62740 | georg.brandl | 2008-05-05 23:06:48 +0200 (Mon, 05 May 2008) | 2 lines
#2752: fix second example too.
........
r62744 | gregory.p.smith | 2008-05-05 23:53:45 +0200 (Mon, 05 May 2008) | 13 lines
Fix a bug introduced in r62627. see issue2760 and issue2632.
An assertion in readline() would fail as data was already in the
internal buffer even though the socket was in unbuffered read mode.
That case is now handled. More importantly, read() has been fixed to
not over-recv() and leave newly recv()d data in the _fileobject buffer.
The max() vs min() issue in read() is now gone. Neither was correct.
On bounded reads, always ask recv() for the exact amount of data we
still need.
Candidate for backporting to release25-maint along with r62627.
........
r62749 | brett.cannon | 2008-05-06 06:37:31 +0200 (Tue, 06 May 2008) | 3 lines
Fix a bug in the handling of the stacklevel argument in warnings.warn() where
the stack was being unwound by two levels instead of one each time.
........
r62756 | gregory.p.smith | 2008-05-06 09:05:18 +0200 (Tue, 06 May 2008) | 2 lines
fix issue2707 - os.walk docstring example correctness typo.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/socket.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 2f89758..5640919 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -803,7 +803,7 @@ sends traffic to the first one connected successfully. :: import socket import sys - HOST = '' # Symbolic name meaning the local host + HOST = '' # Symbolic name meaning all available interfaces PORT = 50007 # Arbitrary non-privileged port s = None for res in socket.getaddrinfo(HOST, PORT, socket.AF_UNSPEC, socket.SOCK_STREAM, 0, socket.AI_PASSIVE): diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index 9c4a877..8bd0c19 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -1692,7 +1692,7 @@ complete list of changes, or look through the CVS logs for all the details. ``permutations(iter[, r])`` returns all the permutations of length *r* of the iterable's elements. If *r* is not specified, it will default to the - number of elements produced by the iterable. + number of elements produced by the iterable. :: itertools.permutations([1,2,3,4], 2) -> [(1, 2), (1, 3), (1, 4), |