From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Jun 2014 23:47:15 +0000 (-0700)
Subject: merge 3.4 (#13223)
X-Git-Tag: v3.5.0a1~1496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d19da701db80aff583c98fd3278b4f871fc2e05;p=python

merge 3.4 (#13223)
---

9d19da701db80aff583c98fd3278b4f871fc2e05
diff --cc Misc/NEWS
index d13d57385f,57090b6562..46b383bf4b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -92,8 -22,9 +92,11 @@@ Core and Builtin
  Library
  -------
  
 +- 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.
+ 
  - Issue #21463: In urllib.request, fix pruning of the FTP cache.
  
  - Issue #21618: The subprocess module could fail to close open fds that were