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