]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (closes #27758)
authorBenjamin Peterson <benjamin@python.org>
Sun, 14 Aug 2016 00:21:54 +0000 (17:21 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 14 Aug 2016 00:21:54 +0000 (17:21 -0700)
1  2 
Misc/NEWS
Modules/_csv.c

diff --cc Misc/NEWS
index 5ee72c6f450395e2060f3d8e40ca0466b6e125c0,2611c09625828965f141b03a3735e9ba46f795ec..ed580d1c003ef92d61e6a5f5c127de948367e9dc
+++ b/Misc/NEWS
@@@ -34,9 -13,9 +34,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #26750: unittest.mock.create_autospec() now works properly for
 +  subclasses of property() and other data descriptors.
 +
+ - Issue #27758: Fix possible integer overflow in the _csv module for large record
+   lengths.
  - Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the
    HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates
    that the script is in CGI mode.
diff --cc Modules/_csv.c
Simple merge