Convert tko/*.cgi to use absolute imports, to resolve some
ambiguity with importing "frontend".
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1482 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/compose_query.cgi b/tko/compose_query.cgi
index 4e94d52..e21edfd 100755
--- a/tko/compose_query.cgi
+++ b/tko/compose_query.cgi
@@ -7,18 +7,14 @@
"""
print "Content-type: text/html\n"
-import cgi, cgitb, re, datetime, query_lib, time
-import sys, os
-import urllib
-total_wall_time_start = time.time();
-tko = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-sys.path.insert(0, tko)
+import sys, os, urllib, cgi, cgitb, re, datetime, time
-import display, frontend, db, query_lib
-client_bin = os.path.abspath(os.path.join(tko, '../client/bin'))
-sys.path.insert(0, client_bin)
-import kernel_versions
+total_wall_time_start = time.time()
+
+import common
+from autotest_lib.tko import display, frontend, db, query_lib
+from autotest_lib.client.bin import kernel_versions
html_header = """\
<form action="compose_query.cgi" method="get">
diff --git a/tko/machine_aggr.cgi b/tko/machine_aggr.cgi
index 5c23644..ea8009e 100644
--- a/tko/machine_aggr.cgi
+++ b/tko/machine_aggr.cgi
@@ -6,12 +6,9 @@
cgitb.enable()
Popen = subprocess.Popen
-tko = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-sys.path.insert(0, tko)
-import db, display, frontend, plotgraph
-client_bin = os.path.abspath(os.path.join(tko, '../client/bin'))
-sys.path.insert(0, client_bin)
-import kernel_versions
+import common
+from autotest_lib.tko import db, display, frontend, plotgraph
+from autotest_lib.client.bin import kernel_versions
released_kernel = re.compile('2\.\d\.\d+(-smp-)[0-9]{3}\.[0-9]$')
rc_kernel = re.compile('2\.\d\.\d+(-smp-)[0-9]{3}\.[0-9]_rc[0-9]$')
diff --git a/tko/machine_benchmark.cgi b/tko/machine_benchmark.cgi
index d0b1aef..0c7bc7d 100755
--- a/tko/machine_benchmark.cgi
+++ b/tko/machine_benchmark.cgi
@@ -4,9 +4,8 @@
sys.stdout.flush()
cgitb.enable()
-tko = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-sys.path.insert(0, tko)
-import db, display, frontend
+import common
+from autotest_lib.tko import db, display, frontend
db = db.db()
diff --git a/tko/machine_test_attribute_graph.cgi b/tko/machine_test_attribute_graph.cgi
index 8a16a6b..2d5a477 100755
--- a/tko/machine_test_attribute_graph.cgi
+++ b/tko/machine_test_attribute_graph.cgi
@@ -6,12 +6,9 @@
cgitb.enable()
Popen = subprocess.Popen
-tko = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-sys.path.insert(0, tko)
-import db, display, frontend, plotgraph
-client_bin = os.path.abspath(os.path.join(tko, '../client/bin'))
-sys.path.insert(0, client_bin)
-import kernel_versions
+import common
+from autotest_lib.tko import db, display, frontend, plotgraph
+from autotest_lib.client.bin import kernel_versions
db = db.db()
diff --git a/tko/test.cgi b/tko/test.cgi
index d96d82f..a1597ae 100644
--- a/tko/test.cgi
+++ b/tko/test.cgi
@@ -9,9 +9,8 @@
sys.stdout.flush()
cgitb.enable()
-tko = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
-sys.path.insert(0, tko)
-import db, display, frontend
+import common
+from autotest_lib.tko import db, display, frontend
db = db.db()