From: David-Sarah Hopwood <david-sarah@jacaranda.org>
Date: Fri, 15 Mar 2013 05:13:30 +0000 (+0000)
Subject: Require at least Python 2.6. fixes #1658
X-Git-Tag: allmydata-tahoe-1.10a1~13
X-Git-Url: https://git.rkrishnan.org/simplejson/components/%22doc.html/(%5B%5E?a=commitdiff_plain;h=7008ffa55e601341159c02d6b22e1f883a04d528;p=tahoe-lafs%2Ftahoe-lafs.git

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 e5a04e10..3fb7efed 100644
--- 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 46db1921..bbe4a918 100644
--- 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 ff9a8fbf..f6eff199 100644
--- 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)