From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 14 Aug 2016 00:21:54 +0000 (-0700)
Subject: merge 3.4 (closes #27758)
X-Git-Tag: v3.6.0a4~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9745ee0b444c92a23a1b8851f789044baa64dba5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (closes #27758)
---

9745ee0b444c92a23a1b8851f789044baa64dba5
diff --cc Misc/NEWS
index 5ee72c6f4503,2611c0962582..ed580d1c003e
--- a/Misc/NEWS
+++ 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.