summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-13 16:25:33 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-13 16:25:33 (GMT)
commit674f40092aeaa38e2748fe7c1979b4710cbb5720 (patch)
treedef3fe77f1abe85672927383c3d0254a7c27d25d /Misc/ACKS
parentbc5d78d30407a102fb9c1388bf8ca10825b4cefc (diff)
downloadcpython-674f40092aeaa38e2748fe7c1979b4710cbb5720.zip
cpython-674f40092aeaa38e2748fe7c1979b4710cbb5720.tar.gz
cpython-674f40092aeaa38e2748fe7c1979b4710cbb5720.tar.bz2
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. ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ece5f56..01d18ec 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -872,5 +872,6 @@ Artur Zaprzala
Mike Zarnstorff
Siebren van der Zee
Uwe Zessin
+Kai Zhu
Tarek Ziadé
Peter Ã…strand