#8964: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-10-21 03:05:46 +03:00
commit 5c16c2eb45
4 changed files with 33 additions and 3 deletions

View file

@ -818,6 +818,7 @@ Nick Mathewson
Simon Mathieu
Laura Matson
Graham Matthews
Martin Matusiak
Dieter Maurer
Daniel May
Madison May

View file

@ -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.