diff options
author | Georg Brandl <georg@python.org> | 2013-10-13 20:20:08 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-10-13 20:20:08 (GMT) |
commit | 03d010be147ca85a18bf26a54991ddc94264e12b (patch) | |
tree | 41357b1e753adc3741c7a255a85c13a38e870c46 /Doc/tools | |
parent | 12ec29f1051cff7b69f31a89ad4df7a2261892e2 (diff) | |
parent | c3a2916919e9beb5ce22db3a677538715b18f5d1 (diff) | |
download | cpython-03d010be147ca85a18bf26a54991ddc94264e12b.zip cpython-03d010be147ca85a18bf26a54991ddc94264e12b.tar.gz cpython-03d010be147ca85a18bf26a54991ddc94264e12b.tar.bz2 |
merge with 3.3
Diffstat (limited to 'Doc/tools')
-rw-r--r-- | Doc/tools/sphinx-build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py index 91be6f0..a446dfa 100644 --- a/Doc/tools/sphinx-build.py +++ b/Doc/tools/sphinx-build.py @@ -15,7 +15,7 @@ warnings.filterwarnings('ignore', category=UserWarning, module='jinja2') if __name__ == '__main__': - if sys.version_info[:3] < (2, 4, 0): + if sys.version_info[:3] < (2, 4, 0) or sys.version_info[:3] > (3, 0, 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 |