merge 3.4

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

diff --cc Misc/NEWS
index ed580d1c003ef92d61e6a5f5c127de948367e9dc,ca80c73b35106ca22a17f8fe796df08a85efb90e..60d6c5f41bb6d04b1f581062dbacd32860144bb5
--- 1/Misc/NEWS
--- 2/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.
  

diff --cc Modules/_cursesmodule.c
Simple merge