summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-19 09:24:19 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-19 09:24:19 (GMT)
commitbd84a588e30e51c8a0bcca2a27aea5cb0e3817c7 (patch)
treee8c07299cc08fbc8fdcc66cff872f1cba2eb6e68
parent04c420f605b2bb7902f1afc3d62a45fbb0295bd0 (diff)
downloadcpython-bd84a588e30e51c8a0bcca2a27aea5cb0e3817c7.zip
cpython-bd84a588e30e51c8a0bcca2a27aea5cb0e3817c7.tar.gz
cpython-bd84a588e30e51c8a0bcca2a27aea5cb0e3817c7.tar.bz2
Fix 3k's sphinx-build.py so that the version detection works with 2.x and 3.x.
-rw-r--r--Doc/tools/sphinx-build.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index d72a831..e87b6c0 100644
--- a/Doc/tools/sphinx-build.py
+++ b/Doc/tools/sphinx-build.py
@@ -12,12 +12,12 @@ import sys
if __name__ == '__main__':
if sys.version_info[:3] < (2, 4, 0):
- print("""\
+ 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``).
-""", file=sys.stderr)
+""")
sys.exit(1)
from sphinx import main