diff options
author | Georg Brandl <georg@python.org> | 2007-08-31 06:20:46 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2007-08-31 06:20:46 (GMT) |
commit | fd5359c772ef184dc4ece064ac77018dfbaf614d (patch) | |
tree | e8f63bfe6b04a3dccfc49c009f7c58bff7f09ef1 | |
parent | 5a165584d78fd7ed585ecb085bb891ac84487a76 (diff) | |
download | cpython-fd5359c772ef184dc4ece064ac77018dfbaf614d.zip cpython-fd5359c772ef184dc4ece064ac77018dfbaf614d.tar.gz cpython-fd5359c772ef184dc4ece064ac77018dfbaf614d.tar.bz2 |
Fix sphinx-build so that it runs with 2.x and 3.x but refuses to start with 3.x.
-rw-r--r-- | Doc/tools/sphinx-build.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py index f18af29..ab9f40d 100644 --- a/Doc/tools/sphinx-build.py +++ b/Doc/tools/sphinx-build.py @@ -11,13 +11,12 @@ import sys if __name__ == '__main__': - if sys.version_info[:3] < (2, 5, 1): - print("""\ -Error: Sphinx needs to be executed with Python 2.5.1 or newer -(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) + if not (2, 5, 1) <= sys.version_info[:3] < (3, 0, 0): + sys.stderr.write("""\ +Error: Sphinx needs to be executed with Python 2.5.1 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 |