Changeset 7008ffa in trunk

Timestamp:

2013-03-15T05:13:30Z (12 years ago)

Author:

David-Sarah Hopwood <david-sarah@…>

Branches:

master

Children:

427193d

Parents:

3bdd744

Message:

Require at least Python 2.6. fixes #1658

Signed-off-by: David-Sarah Hopwood <david-sarah@…>

Files:

• bin/tahoe-script.template (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/allmydata/__init__.py (modified) (1 diff)

bin/tahoe-script.template ¶

@@ -1 +1 @@
 #!/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

setup.py ¶

@@ -1 +1 @@
 #! /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

src/allmydata/__init__.py ¶

@@ -358 +358 @@
     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,))