diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-10-21 00:05:46 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-10-21 00:05:46 (GMT) |
| commit | 5c16c2eb457f9bba8bf04e11cf77a3de5035a178 (patch) | |
| tree | 41f8deb85edeb7523380cd36962655cf98e077c8 /Misc | |
| parent | 632f1bfd3902e0b020ba697cdb7b31df7b2656d6 (diff) | |
| parent | f076f53386c422060517b8f088eadff3a80e48e6 (diff) | |
| download | cpython-5c16c2eb457f9bba8bf04e11cf77a3de5035a178.zip cpython-5c16c2eb457f9bba8bf04e11cf77a3de5035a178.tar.gz cpython-5c16c2eb457f9bba8bf04e11cf77a3de5035a178.tar.bz2 | |
#8964: merge with 3.3.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -818,6 +818,7 @@ Nick Mathewson Simon Mathieu Laura Matson Graham Matthews +Martin Matusiak Dieter Maurer Daniel May Madison May @@ -62,6 +62,9 @@ Core and Builtins Library ------- +- Issue #8964: fix platform._sys_version to handle IronPython 2.6+. + Patch by Martin Matusiak. + - Issue #18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM. |