Require at least Python 2.6. fixes #1658

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>

diff --git a/bin/tahoe-script.template b/bin/tahoe-script.template
index e5a04e1083f52c8791e6831d383f1f8aef3632e9..3fb7efedf717f8af311ea39aa7bf0221e801f076 100644 (file)
--- a/bin/tahoe-script.template
+++ b/bin/tahoe-script.template
@@ -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
 

diff --git a/setup.py b/setup.py
index 46db19213c6e066ba660ccac9846d6205281d1be..bbe4a91851d8e79ea4efab1bc983e2ff26ada3df 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -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
 #

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index ff9a8fbfd371acfee90a24f13450264c1f060d2c..f6eff199e45019d2da08faa1f0a1182aca81d3b4 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -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)