merge 3.4 (#21548)

diff --cc Lib/pydoc.py
Simple merge

diff --cc Lib/test/test_pydoc.py
index 67424442e68281a3d5e2fda26e78b9640aa2020b,1427c77fb1b15f4c0a140aa458accd8f7789c196..41ad792144a159c49dc4d4e1c6f79a3b16b6b880
--- 1/Lib/test/test_pydoc.py
--- 2/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@@ -2,8 -2,11 +2,10 @@@ import o
  import sys
  import builtins
  import contextlib
 -import difflib
+ import importlib.util
  import inspect
  import pydoc
+ import py_compile
  import keyword
  import _pickle
  import pkgutil

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
Simple merge