merge 3.4 (#11709)

diff --cc Lib/pydoc.py
Simple merge

diff --cc Misc/NEWS
index 3679df42ca75a77a8a6e309522e4a14a87307312,6979b2f107cd16e84938756680f79a890926b71e..70bd1604ac68c77e1b5e7a4df2fca995a2d74f83
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -92,10 -22,9 +92,13 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #20578: Add io.BufferedIOBase.readinto1.
 +
+ - Issue #11709: Fix the pydoc.help function to not fail when sys.stdin is not a
+   valid file.
+ 
 +- Issue #21515: tempfile.TemporaryFile now uses os.O_TMPFILE flag is available.
 +
  - Issue #13223: Fix pydoc.writedoc so that the HTML documentation for methods
    that use 'self' in the example code is generated correctly.