From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 8 Jun 2014 03:17:29 +0000 (-0700)
Subject: merge 3.4 (#11709)
X-Git-Tag: v3.5.0a1~1493
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eac219436c0503968b47b7e316a2c1a72ed823f7;p=python

merge 3.4 (#11709)
---

eac219436c0503968b47b7e316a2c1a72ed823f7
diff --cc Misc/NEWS
index 3679df42ca,6979b2f107..70bd1604ac
--- a/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.