merge 3.4 (#13223)

diff --cc Lib/pydoc.py
Simple merge

diff --cc Misc/NEWS
index d13d57385f18ac7ce81a82ce8a59c2e9e56e18c8,57090b65624f0df20ae69b95daf65c0bed6ab790..46b383bf4b6889217004efed65753df7d730f533
--- 1/Misc/NEWS
--- 2/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