summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-07-19 23:25:25 (GMT)
committerBarry Warsaw <barry@python.org>2011-07-19 23:25:25 (GMT)
commit6d744261e2bd0fd34c826f8b39d3326dd502fe50 (patch)
tree96f95119eac5d9fc184d7c9c8adbeb31d445f1c8 /Misc
parent2ebada4233bdc1b25a83800a9040a43ccfe0bed4 (diff)
parentdac7de31023980d82501a8a2aa4af0c55beedca4 (diff)
downloadcpython-6d744261e2bd0fd34c826f8b39d3326dd502fe50.zip
cpython-6d744261e2bd0fd34c826f8b39d3326dd502fe50.tar.gz
cpython-6d744261e2bd0fd34c826f8b39d3326dd502fe50.tar.bz2
Upstream merge.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS7
2 files changed, 8 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index da13b93..1e9a721 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1030,6 +1030,7 @@ Gordon Worley
Thomas Wouters
Heiko Wundram
Doug Wyatt
+Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
diff --git a/Misc/NEWS b/Misc/NEWS
index d7d9ef2..91f3883 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,10 @@ Core and Builtins
Library
-------
+- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2
+ directory, so that "import DLFCN" and other similar imports work on
+ Linux 3.0.
+
- Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN
commands; they aren't required and in fact postfix doesn't support that form.
@@ -1058,6 +1062,9 @@ Extension Modules
Tests
-----
+- Issue #12587: Correct faulty test file and reference in test_tokenize.
+ (Patch by Robert Xiao)
+
- Issue #12573: Add resource checks for dangling Thread and Process objects.
- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'