From: Georg Brandl <georg@python.org>
Date: Thu, 30 Oct 2014 21:56:04 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~564
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e075f1617f90ba4d6ce03ef6e5cc7947f0fd4beb;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

e075f1617f90ba4d6ce03ef6e5cc7947f0fd4beb
diff --cc Doc/tools/extensions/pyspecific.py
index 76f6a9f9d7f6,9b5a5e3849cc..9d1c195594fd
--- a/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
+ 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/3.4/%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