Merged revisions 83201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83201 | georg.brandl | 2010-07-28 10:19:35 +0200 (Mi, 28 Jul 2010) | 1 line
#9354: Provide getsockopt() in asyncore file_wrapper(). Patch by Lukas Langa.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index c75fced..08b26c8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -438,8 +438,8 @@
Andrew Kuchling
Vladimir Kushnir
Cameron Laird
-Tino Lange
Łukasz Langa
+Tino Lange
Andrew Langmead
Detlef Lannert
Soren Larsen
diff --git a/Misc/NEWS b/Misc/NEWS
index 175e117..29b777a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@
Library
-------
+- Issue #9354: Provide getsockopt() in asyncore's file_wrapper.
+
- Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *'
entries, consider the first one.
@@ -951,6 +953,7 @@
Library
-------
+
- Issue #1555570: email no longer inserts extra blank lines when a \r\n
combo crosses an 8192 byte boundary.