]> granicus.if.org Git - python/commit
Merged revisions 85420 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 13 Oct 2010 16:25:33 +0000 (16:25 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 13 Oct 2010 16:25:33 +0000 (16:25 +0000)
commit674f40092aeaa38e2748fe7c1979b4710cbb5720
treedef3fe77f1abe85672927383c3d0254a7c27d25d
parentbc5d78d30407a102fb9c1388bf8ca10825b4cefc
Merged revisions 85420 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85420 | antoine.pitrou | 2010-10-13 18:17:14 +0200 (mer., 13 oct. 2010) | 5 lines

  Issue #10041: The signature of optional arguments in socket.makefile()
  didn't match that of io.open(), and they also didn't get forwarded
  properly to TextIOWrapper in text mode.  Patch by Kai Zhu.
........
Doc/library/socket.rst
Lib/socket.py
Lib/test/test_socket.py
Misc/ACKS
Misc/NEWS