From 36b01c30b31e7feb21d65acd0afe76005a331f96 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 19 Feb 2009 07:12:22 +0000 Subject: [PATCH] Taken from the 2.6 branch: r68984 | georg.brandl | 2009-01-27 00:06:17 +0100 (Di, 27. Jan 2009) | 2 lines Allow docs to be built with Sphinx 0.5.x. --- Doc/tools/sphinxext/pyspecific.py | 11 +++++++++-- Doc/tools/sphinxext/suspicious.py | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index be0da34683ae..860b15399e9c 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -54,8 +54,15 @@ from pprint import pformat from docutils.io import StringOutput from docutils.utils import new_document -from sphinx.builders import Builder -from sphinx.writers.text import TextWriter +try: + from sphinx.builders import Builder +except ImportError: + from sphinx.builder import Builder + +try: + from sphinx.writers.text import TextWriter +except ImportError: + from sphinx.textwriter import TextWriter class PydocTopicsBuilder(Builder): diff --git a/Doc/tools/sphinxext/suspicious.py b/Doc/tools/sphinxext/suspicious.py index ae11793ea548..245a759bed92 100644 --- a/Doc/tools/sphinxext/suspicious.py +++ b/Doc/tools/sphinxext/suspicious.py @@ -45,7 +45,12 @@ import os, sys import csv import re from docutils import nodes -from sphinx.builders import Builder + +try: + from sphinx.builders import Builder +except ImportError: + from sphinx.builder import Builder + detect_all = re.compile(ur''' ::(?=[^=])| # two :: (but NOT ::=) -- 2.47.3