commit 674f40092aeaa38e2748fe7c1979b4710cbb5720
author Antoine Pitrou <solipsis@pitrou.net> Wed Oct 13 16:25:33 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Wed Oct 13 16:25:33 2010 +0000
tree def3fe77f1abe85672927383c3d0254a7c27d25d
parent bc5d78d30407a102fb9c1388bf8ca10825b4cefc

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

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 931dd14..391216e 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -588,7 +588,7 @@
    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