merge with 3.4

diff --cc Doc/tools/extensions/pyspecific.py
index 76f6a9f9d7f6431058d702e407eb9c330405ce3c,9b5a5e3849cc285ca992682395860b6f4c67e1da..9d1c195594fd76b381e568cdd4665e0d9b2c5860
--- 1/Doc/tools/extensions/pyspecific.py
--- 2/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@@ -17,7 -24,17 +24,17 @@@ from sphinx.builders import Builde
  from sphinx.util.nodes import split_explicit_title
  from sphinx.util.compat import Directive
  from sphinx.writers.html import HTMLTranslator
+ from sphinx.writers.text import TextWriter
  from sphinx.writers.latex import LaTeXTranslator
 -SOURCE_URI = 'https://hg.python.org/cpython/file/3.4/%s'
+ from sphinx.domains.python import PyModulelevel, PyClassmember
+ 
+ # Support for checking for suspicious markup
+ 
+ import suspicious
+ 
+ 
+ ISSUE_URI = 'https://bugs.python.org/issue%s'
++SOURCE_URI = 'https://hg.python.org/cpython/file/default/%s'
  
  # monkey-patch reST parser to disable alphabetic and roman enumerated lists
  from docutils.parsers.rst.states import Body