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

merge 3.4
---

f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec
diff --cc Misc/NEWS
index ed580d1c003e,ca80c73b3510..60d6c5f41bb6
--- 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.
 +
+ - In the curses module, raise an error if window.getstr() is passed a negative
+   value.
+ 
  - Issue #27758: Fix possible integer overflow in the _csv module for large record
    lengths.