merge 3.4

diff --cc Lib/test/test_curses.py
Simple merge

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

diff --cc Modules/_cursesmodule.c
Simple merge