Make PyAuto functional tests compatible with python 2.7

chrome/test/functional/pyauto_functional.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Setup for PyAuto functional tests.
 
 Use the following in your scripts to run them standalone:
 
 # This should be at the top
@@ skipping 59 matching lines @@
     RunAgain()
 
   # Check this is the right bitness on mac.
   # platform.architecture() will not help us on mac, since multiple binaries
   # are stuffed inside the universal python binary.
   if sys.platform.startswith('darwin') and sys.maxint > 2**32:
     # User is running 64-bit python, but we should use 32-bit.
     RunAgain()
 
 
-RunWithCorrectPythonIfNecessary()
+# Check the environment variable DO_NOT_RESTART_PYTHON_FOR_PYAUTO. If

[Nirnimesh, 2012/07/12 02:36:24]

The comment is too long, and is explaining the code. Change to:
Do not attempt to figure out python versions if DO_NOT_RESTART_PYTHON_FOR_PYAUTO
is set.

[fdeng1, 2012/07/12 03:47:52]

Done.

+# it is set (to any value), then do not try to run with the correct
+# python(i.e. 2.6) regardless what the current python version is.
+if os.getenv('DO_NOT_RESTART_PYTHON_FOR_PYAUTO') is None:
+  RunWithCorrectPythonIfNecessary()
+else:
+  print 'Will not try to restart with the correct version of python '\
+        'as DO_NOT_RESTART_PYTHON_FOR_PYAUTO is set.'
 
 
 try:
   import pyauto
 except ImportError:
   print >>sys.stderr, 'Cannot import pyauto from %s' % sys.path
   raise
 
 
 class Main(pyauto.Main):
   """Main program for running PyAuto functional tests."""
 
   def __init__(self):
     # Make scripts in this dir importable
     sys.path.append(os.path.dirname(__file__))
     pyauto.Main.__init__(self)
 
   def TestsDir(self):
     return os.path.dirname(__file__)
 
 
 if __name__ == '__main__':
   Main()