diff options
author | shimizukawa <shimizukawa@gmail.com> | 2014-01-18 20:41:43 +0900 |
---|---|---|
committer | shimizukawa <shimizukawa@gmail.com> | 2014-01-18 20:41:43 +0900 |
commit | dc62e8d7ea844a4b2ac7bd880d2d3966deebb207 (patch) | |
tree | 76ea87ca4e9a71f1262724673d1654f03e08c117 /sphinx/__init__.py | |
parent | 22bff8279d4d2d0096152337ae2b6b3951f92e29 (diff) | |
parent | 39287f95535866e2d4d1544f8688ce22fd19a69a (diff) | |
download | sphinx-dc62e8d7ea844a4b2ac7bd880d2d3966deebb207.tar.gz |
merge heads
Diffstat (limited to 'sphinx/__init__.py')
-rw-r--r-- | sphinx/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 7fa3bfe9..24d5cc21 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -42,7 +42,8 @@ if '+' in __version__ or 'pre' in __version__: def main(argv=sys.argv): """Sphinx build "main" command-line entry.""" - if sys.version_info[:3] < (2, 6, 0): + if (sys.version_info[:3] < (2, 6, 0) or + (3, 0, 0) <= sys.version_info[:3] < (3, 2, 0)): sys.stderr.write('Error: Sphinx requires at least Python 2.6 to run.\n') return 1 try: |