summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-01 00:06:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-01 00:06:17 (GMT)
commit0aa71f79821e22c987f86808b0333d57c663728c (patch)
tree75c1e3ebcbaed80d6b5ac9af498676ff7b9af108 /Misc
parent87b9bc3893bac402bd773a83ee6734507f978607 (diff)
parenta22c98de8507b18ed0c0933f81e6b0ab63467d11 (diff)
downloadcpython-0aa71f79821e22c987f86808b0333d57c663728c.zip
cpython-0aa71f79821e22c987f86808b0333d57c663728c.tar.gz
cpython-0aa71f79821e22c987f86808b0333d57c663728c.tar.bz2
merge 3.1 (#12221)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3703ac5..baf235c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,11 @@ Library
- Issue #12065: connect_ex() on an SSL socket now returns the original errno
when the socket's timeout expires (it used to return None).
+Extension Modules
+-----------------
+
+- Issue #12221: Replace pyexpat.__version__ with the Python version.
+
Build
-----