diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-06-01 00:06:17 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-06-01 00:06:17 (GMT) |
commit | 0aa71f79821e22c987f86808b0333d57c663728c (patch) | |
tree | 75c1e3ebcbaed80d6b5ac9af498676ff7b9af108 /Misc | |
parent | 87b9bc3893bac402bd773a83ee6734507f978607 (diff) | |
parent | a22c98de8507b18ed0c0933f81e6b0ab63467d11 (diff) | |
download | cpython-0aa71f79821e22c987f86808b0333d57c663728c.zip cpython-0aa71f79821e22c987f86808b0333d57c663728c.tar.gz cpython-0aa71f79821e22c987f86808b0333d57c663728c.tar.bz2 |
merge 3.1 (#12221)
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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 ----- |