python-docs/python3-docs-use-local-pyth...

41 lines
1.2 KiB
Diff

diff -r 042ff9325c5e Doc/Makefile
--- a/Doc/Makefile Mon Jul 22 22:08:09 2013 -0700
+++ b/Doc/Makefile Mon Sep 16 14:43:50 2013 +0200
@@ -4,7 +4,7 @@
#
# You can set these variables from the command line.
-PYTHON = python
+PYTHON = python3
SVNROOT = http://svn.python.org/projects
SPHINXOPTS =
PAPER =
@@ -58,7 +58,7 @@
update: clean checkout
-build: checkout
+build:
mkdir -p build/$(BUILDER) build/doctrees
$(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS)
@echo
diff -r 042ff9325c5e Doc/tools/sphinx-build.py
--- a/Doc/tools/sphinx-build.py Mon Jul 22 22:08:09 2013 -0700
+++ b/Doc/tools/sphinx-build.py Mon Sep 16 14:43:50 2013 +0200
@@ -14,15 +14,5 @@
warnings.filterwarnings('ignore', category=UserWarning, module='jinja2')
if __name__ == '__main__':
-
- if sys.version_info[:3] < (2, 4, 0):
- sys.stderr.write("""\
-Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.0 though).
-(If you run this from the Makefile, you can set the PYTHON variable
-to the path of an alternative interpreter executable, e.g.,
-``make html PYTHON=python2.5``).
-""")
- sys.exit(1)
-
from sphinx import main
sys.exit(main(sys.argv))