Not all distros put a symlink in for the python version. However
all should have a /usr/bin/python target. There are still a couple
files that hardcode a /usr/lib/python2.4 path, but that's a harder
problem to solve and outside the scope of this patch.
Signed-off-by: Jesse Keating <jkeating@redhat.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3319 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/cli/change_protection_level.py b/cli/change_protection_level.py
index ba54440..0807878 100755
--- a/cli/change_protection_level.py
+++ b/cli/change_protection_level.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# change_protection_level.py "No protection" machine1 machine2 machine3
diff --git a/client/common_lib/barrier_unittest.py b/client/common_lib/barrier_unittest.py
index 2d0e557..abc24f7 100644
--- a/client/common_lib/barrier_unittest.py
+++ b/client/common_lib/barrier_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
__author__ = """Ashwin Ganti (aganti@google.com)"""
diff --git a/client/common_lib/test_unittest.py b/client/common_lib/test_unittest.py
index 5a5351a..2bc3a86 100644
--- a/client/common_lib/test_unittest.py
+++ b/client/common_lib/test_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
"""Unit Tests for autotest.client.common_lib.test"""
diff --git a/client/tools/autotest b/client/tools/autotest
index 2b47b37..42f6238 100755
--- a/client/tools/autotest
+++ b/client/tools/autotest
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import sys,os
autodir = None
diff --git a/conmux/contrib/console_check.py b/conmux/contrib/console_check.py
index 7e450e8..292a07b 100644
--- a/conmux/contrib/console_check.py
+++ b/conmux/contrib/console_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
_author_ = 'Scott Zawalski (scottz@google.com)'
diff --git a/database/database_connection_unittest.py b/database/database_connection_unittest.py
index 12700b8..b5386af 100644
--- a/database/database_connection_unittest.py
+++ b/database/database_connection_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import unittest, time
import common
diff --git a/database/migrate_unittest.py b/database/migrate_unittest.py
index ebf0927..034f633 100644
--- a/database/migrate_unittest.py
+++ b/database/migrate_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import unittest, tempfile, os
import common
diff --git a/scheduler/drone_utility.py b/scheduler/drone_utility.py
index b830078..ab5e505 100644
--- a/scheduler/drone_utility.py
+++ b/scheduler/drone_utility.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import pickle, subprocess, os, shutil, socket, sys, time, signal, getpass
import datetime, traceback, tempfile
diff --git a/server/base_utils_unittest.py b/server/base_utils_unittest.py
index 002164e..111dfbe 100644
--- a/server/base_utils_unittest.py
+++ b/server/base_utils_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
__author__ = 'raphtee@google.com (Travis Miller)'
diff --git a/server/hosts/monitors/console.py b/server/hosts/monitors/console.py
index 5b8d843..bab421c 100644
--- a/server/hosts/monitors/console.py
+++ b/server/hosts/monitors/console.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
#
# Script for translating console output (from STDIN) into Autotest
# warning messages.
diff --git a/server/hosts/monitors/followfiles.py b/server/hosts/monitors/followfiles.py
index d3716b7..f2ad4d9 100644
--- a/server/hosts/monitors/followfiles.py
+++ b/server/hosts/monitors/followfiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
#
# Script for tailing one to many logfiles and merging their output.
diff --git a/server/hosts/monitors/monitors_util_unittest.py b/server/hosts/monitors/monitors_util_unittest.py
index e22cdd3..b7a19d7 100644
--- a/server/hosts/monitors/monitors_util_unittest.py
+++ b/server/hosts/monitors/monitors_util_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import fcntl, os, signal, subprocess, StringIO
import tempfile, textwrap, time, unittest
diff --git a/tko/parsers/test/inspect_parser_result_store.py b/tko/parsers/test/inspect_parser_result_store.py
index 25af35d..458b637 100644
--- a/tko/parsers/test/inspect_parser_result_store.py
+++ b/tko/parsers/test/inspect_parser_result_store.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4 -i
+#!/usr/bin/python -i
"""Inspector for parser_result.store from specified scenerio package.
Load in parser_result.store as 'sto' and launch interactive interp.
diff --git a/tko/parsers/test/new_scenario.py b/tko/parsers/test/new_scenario.py
index 66b2c9e..37efdcf 100644
--- a/tko/parsers/test/new_scenario.py
+++ b/tko/parsers/test/new_scenario.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
"""Create new scenario test instance from an existing results directory.
This automates creation of regression tests for the results parsers.
diff --git a/tko/parsers/test/templates/base.py b/tko/parsers/test/templates/base.py
index af1bbfc..15f4360 100644
--- a/tko/parsers/test/templates/base.py
+++ b/tko/parsers/test/templates/base.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
"""
This is not meant to be executed unless copied into a
scenario package and renamed with a _unittest suffix.
diff --git a/utils/coverage_suite.py b/utils/coverage_suite.py
index 94344be..a79db76 100644
--- a/utils/coverage_suite.py
+++ b/utils/coverage_suite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
import os, sys
import unittest_suite
diff --git a/utils/test_importer.py b/utils/test_importer.py
index 25f0558..e0f6859 100644
--- a/utils/test_importer.py
+++ b/utils/test_importer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
#
# Copyright 2008 Google Inc. All Rights Reserved.
"""