From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 21 Oct 2013 00:05:46 +0000 (+0300)
Subject: #8964: merge with 3.3.
X-Git-Tag: v3.4.0b1~571^2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c16c2eb457f9bba8bf04e11cf77a3de5035a178;p=thirdparty%2FPython%2Fcpython.git

#8964: merge with 3.3.
---

5c16c2eb457f9bba8bf04e11cf77a3de5035a178
diff --cc Misc/NEWS
index af66063d69da,308b67450d9f..8a31887d7f6d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -62,12 -78,9 +62,15 @@@ Core and Builtin
  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.
 +
 +- Issue #19307: Improve error message for json.load(s) while passing objects
 +  of the wrong type.
 +
  - 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.