merge 3.4

This commit is contained in:
Benjamin Peterson 2015-12-05 00:24:01 -08:00
commit c98bbd5289

View File

@ -3062,8 +3062,9 @@ Library
- Issue #20968: unittest.mock.MagicMock now supports division.
Patch by Johannes Baiter.
- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
parameter. Bug reported by Guido Vranken.
- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in
JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido
Vranken.
- Issue #21169: getpass now handles non-ascii characters that the
input stream encoding cannot encode by re-encoding using the