diff --git a/gluon/widget.py b/gluon/widget.py index 64720bba..beee5177 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -40,8 +40,8 @@ ProgramInfo = '''%s %s %s''' % (ProgramName, ProgramAuthor, ProgramVersion) -if not sys.version[:3] in ['2.5', '2.6', '2.7']: - msg = 'Warning: web2py requires Python 2.5, 2.6 or 2.7 but you are running:\n%s' +if not sys.version[:3] in ['2.6', '2.7']: + msg = 'Warning: web2py requires Python 2.6 or 2.7 but you are running:\n%s' msg = msg % sys.version sys.stderr.write(msg) @@ -56,8 +56,8 @@ def run_system_tests(options): major_version = sys.version_info[0] minor_version = sys.version_info[1] if major_version == 2: - if minor_version in (5, 6): - sys.stderr.write("Python 2.5 or 2.6\n") + if minor_version in (6,): + sys.stderr.write('Python 2.6\n') ret = subprocess.call(['unit2', '-v', 'gluon.tests']) elif minor_version in (7,): call_args = [sys.executable, '-m', 'unittest', '-v', 'gluon.tests'] diff --git a/web2py.py b/web2py.py index 42ec1c22..ad884744 100755 --- a/web2py.py +++ b/web2py.py @@ -3,6 +3,9 @@ import os import sys +import gluon.widget +from multiprocessing import freeze_support +# import gluon.import_all ##### This should be uncommented for py2exe.py if hasattr(sys, 'frozen'): path = os.path.dirname(os.path.abspath(sys.executable)) # for py2exe @@ -14,17 +17,10 @@ os.chdir(path) sys.path = [path] + [p for p in sys.path if not p == path] -# import gluon.import_all ##### This should be uncommented for py2exe.py -import gluon.widget - # Start Web2py and Web2py cron service! if __name__ == '__main__': - try: - from multiprocessing import freeze_support - freeze_support() - except: - sys.stderr.write('Sorry, -K only supported for python 2.6-2.7\n') - if os.environ.has_key("COVERAGE_PROCESS_START"): + freeze_support() + if 'COVERAGE_PROCESS_START' in os.environ: try: import coverage coverage.process_startup()