Merged revert
authorSverre Rabbelier <sverre@rabbelier.nl>
Fri, 01 May 2009 00:25:11 +0200
changeset 2289 f016f5239078
parent 2288 b3f22d6ee467 (current diff)
parent 2287 f668847ebb75 (diff)
child 2290 a9f77dea9e73
Merged revert
--- a/thirdparty/google_appengine/dev_appserver.py	Fri May 01 00:03:02 2009 +0200
+++ b/thirdparty/google_appengine/dev_appserver.py	Fri May 01 00:25:11 2009 +0200
@@ -21,17 +21,21 @@
 import sys
 
 if not hasattr(sys, 'version_info'):
-  sys.stderr.write('Very old versions of Python are not supported. Please '
-                   'use version 2.5 or greater.\n')
+  sys.stderr.write('Error: Very old versions of Python are not supported. Please '
+                   'use version 2.5.\n')
   sys.exit(1)
 version_tuple = tuple(sys.version_info[:2])
 if version_tuple < (2, 4):
   sys.stderr.write('Error: Python %d.%d is not supported. Please use '
-                   'version 2.5 or greater.\n' % version_tuple)
+                   'version 2.5.\n' % version_tuple)
   sys.exit(1)
 if version_tuple == (2, 4):
   sys.stderr.write('Warning: Python 2.4 is not supported; this program may '
-                   'break. Please use version 2.5 or greater.\n')
+                   'break. Please use version 2.5.\n')
+if version_tuple > (2, 5):
+  sys.stderr.write('Error: Python %d.%d and is not supported; '
+		   'Please use version 2.5, not greater.\n' % version_tuple)
+  sys.exit(1)
 
 DIR_PATH = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
 SCRIPT_DIR = os.path.join(DIR_PATH, 'google', 'appengine', 'tools')