merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-13 22:20:08 +02:00
commit 03d010be14

View file

@ -15,7 +15,7 @@ warnings.filterwarnings('ignore', category=UserWarning, module='jinja2')
if __name__ == '__main__': 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("""\ sys.stderr.write("""\
Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.0 though). 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 (If you run this from the Makefile, you can set the PYTHON variable