summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-10-21 00:03:32 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-10-21 00:03:32 (GMT)
commitf076f53386c422060517b8f088eadff3a80e48e6 (patch)
treebdd0895433e1e8d4e21220a39a683fcded4f96ad /Misc
parentc31844257185f897d657bb8929f36f9c4e8888f2 (diff)
downloadcpython-f076f53386c422060517b8f088eadff3a80e48e6.zip
cpython-f076f53386c422060517b8f088eadff3a80e48e6.tar.gz
cpython-f076f53386c422060517b8f088eadff3a80e48e6.tar.bz2
#8964: fix platform._sys_version to handle IronPython 2.6+.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0a49abf..13e708c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -791,6 +791,7 @@ Nick Mathewson
Simon Mathieu
Laura Matson
Graham Matthews
+Martin Matusiak
Dieter Maurer
Daniel May
Madison May
diff --git a/Misc/NEWS b/Misc/NEWS
index dfce8a7..308b674 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,9 @@ Core and Builtins
Library
-------
+- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
+ Patch by Martin Matusiak.
+
- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
limiting the call to readline(). Original patch by Michał
Jastrzębski and Giampaolo Rodola.