summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-01 21:18:52 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-01 21:18:52 (GMT)
commit7f0c3ffad5a24a684728464c29e00dc47b3e8864 (patch)
tree8472a213492324af0b5465ef31387d6a5e72757e /Misc
parentf89972b3dabb50b637477c771638cef43cb5d38c (diff)
downloadcpython-7f0c3ffad5a24a684728464c29e00dc47b3e8864.zip
cpython-7f0c3ffad5a24a684728464c29e00dc47b3e8864.tar.gz
cpython-7f0c3ffad5a24a684728464c29e00dc47b3e8864.tar.bz2
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. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index c75fced..08b26c8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -438,8 +438,8 @@ Ivan Krstić
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 @@ Core and Builtins
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 @@ Core and Builtins
Library
-------
+
- Issue #1555570: email no longer inserts extra blank lines when a \r\n
combo crosses an 8192 byte boundary.