Require at least Python 2.6. fixes #1658

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
This commit is contained in:
David-Sarah Hopwood 2013-03-15 05:13:30 +00:00
parent 3bdd744b8e
commit 7008ffa55e
3 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,5 @@
#!/bin/false # You must specify a python interpreter.
import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.5 and 2.7.x inclusive."
import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.6 and 2.7.x inclusive."
import os, subprocess

View File

@ -1,6 +1,6 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.5 and 2.7.x inclusive."
import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.6 and 2.7.x inclusive."
# Tahoe-LAFS -- secure, distributed storage grid
#

View File

@ -357,14 +357,14 @@ def check_all_requirements():
errors = []
# We require at least 2.5 on all platforms.
# We require at least 2.6 on all platforms.
# (On Python 3, we'll have failed long before this point.)
if sys.version_info < (2, 5):
if sys.version_info < (2, 6):
try:
version_string = ".".join(map(str, sys.version_info))
except Exception:
version_string = repr(sys.version_info)
errors.append("Tahoe-LAFS current requires Python v2.5 or greater (but less than v3), not %s"
errors.append("Tahoe-LAFS currently requires Python v2.6 or greater (but less than v3), not %s"
% (version_string,))
vers_and_locs = dict(_vers_and_locs_list)