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.
........
This commit is contained in:
Antoine Pitrou 2010-10-13 16:25:33 +00:00
parent bc5d78d304
commit 674f40092a
5 changed files with 117 additions and 61 deletions

View file

@ -588,7 +588,7 @@ correspond to Unix system calls applicable to sockets.
is system-dependent (usually 5).
.. method:: socket.makefile(mode='r', buffering=None, *, encoding=None, newline=None)
.. method:: socket.makefile(mode='r', buffering=None, *, encoding=None, errors=None, newline=None)
.. index:: single: I/O control; buffering