From: Georg Brandl <georg@python.org>
Date: Sat, 12 Oct 2013 18:53:53 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9bd31f98f4dcacb9d1da3f68a57359eb262e833;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

e9bd31f98f4dcacb9d1da3f68a57359eb262e833
diff --cc Doc/tools/sphinxext/pyspecific.py
index df6e48adceff,388fe3a99b1c..2b5de1421e73
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@@ -10,10 -10,15 +10,15 @@@
  """
  
  ISSUE_URI = 'http://bugs.python.org/issue%s'
 -SOURCE_URI = 'http://hg.python.org/cpython/file/3.3/%s'
 +SOURCE_URI = 'http://hg.python.org/cpython/file/default/%s'
  
  from docutils import nodes, utils
+ 
+ import sphinx
  from sphinx.util.nodes import split_explicit_title
+ from sphinx.writers.html import HTMLTranslator
+ from sphinx.writers.latex import LaTeXTranslator
+ from sphinx.locale import versionlabels
  
  # monkey-patch reST parser to disable alphabetic and roman enumerated lists
  from docutils.parsers.rst.states import Body