From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Aug 2016 04:43:57 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.6.0b1~713^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1c6bdc76a1ac7bc40850f75dbc2dff0b361ee3d;p=python

merge 3.4
---

b1c6bdc76a1ac7bc40850f75dbc2dff0b361ee3d
diff --cc Misc/NEWS
index d91678005b,bff6e00a12..1de23b575f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -34,11 -13,8 +34,11 @@@ 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.
+ - In the curses module, raise an error if window.getstr() or window.instr() is
+   passed a negative value.
  
  - Issue #27760: Fix possible integer overflow in binascii.b2a_qp.