Merge ~canonical-kernel-team/+git/autotest:autotest3 into ~canonical-kernel-team/+git/autotest:master

[Francis Ginther]

Python 2 to 3 conversion

This has been tested with autopkgtest on lunar (testing linux 5.19.0-21.21).

The intent is to maintain this as a fork for lunar testing until we can replace these test suites for avocado implemented versions.

[Cory Todd (corytodd)]

client/shared/magic.py - wow, so I'm guessing this code dates back to at least Python 2.2 if there are manual radix calculations.

client/tools/results2junit.py:54 If retval is assumed to be a str then this check might be wrong. I think isinstance(text, str) is what we want, otherwise retval is bytes and bytes does not support replace.

2d165be... by Francis Ginther on 2023-04-06

python2to3: Update magic detection to use bytearrays

The file magic detection was modified to read the source file as binary,
which then allows comparisons using bytearrays. This avoids the need to
do any decode operations.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Andrei Gherzan <email address hidden>
Acked-by: Sean Feole <email address hidden>

10d61b5... by Francis Ginther on 2023-04-06

python2to3: Allow for unicode replacement when reading from pipes

Add an error handler when decoding command output from pipes. Otherwise
we'll hit UnicodeDecodeError exceptions.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Andrei Gherzan <email address hidden>
Acked-by: Sean Feole <email address hidden>

012385c... by Francis Ginther on 2023-04-07

python2to3: Remove use of cmp method when comparing version strings

The version string comparison utility was using the python2 cmp method.
This is no longer available in python3.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Sean Feole <email address hidden>
Acked-by: Cory Todd <email address hidden>

Unmerged commits

012385c... by Francis Ginther on 2023-04-07

python2to3: Remove use of cmp method when comparing version strings

The version string comparison utility was using the python2 cmp method.
This is no longer available in python3.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Sean Feole <email address hidden>
Acked-by: Cory Todd <email address hidden>

10d61b5... by Francis Ginther on 2023-04-06

python2to3: Allow for unicode replacement when reading from pipes

Add an error handler when decoding command output from pipes. Otherwise
we'll hit UnicodeDecodeError exceptions.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Andrei Gherzan <email address hidden>
Acked-by: Sean Feole <email address hidden>

2d165be... by Francis Ginther on 2023-04-06

python2to3: Update magic detection to use bytearrays

The file magic detection was modified to read the source file as binary,
which then allows comparisons using bytearrays. This avoids the need to
do any decode operations.

Signed-off-by: Francis Ginther <email address hidden>
Acked-by: Andrei Gherzan <email address hidden>
Acked-by: Sean Feole <email address hidden>

a473bd2... by Francis Ginther on 2023-01-26

python2to3: Use binary files with pickle

Also removed an obsolete call to `exc_clear`.

Signed-off-by: Francis Ginther <email address hidden>

a703803... by Francis Ginther on 2023-01-26

python2to3: byte encode data sent to gzip logfile

Signed-off-by: Francis Ginther <email address hidden>

d13c52c... by Francis Ginther on 2023-01-26

python2to3: don't encode the xml output

After the conversion, the xml file is now handled with regular strings,
no need to do the encoding to bytes.

Signed-off-by: Francis Ginther <email address hidden>

b57401f... by Francis Ginther on 2023-01-26

python2to3: Allow for alternate ordering

The ordering of the results lines are different. Allow for both.

Signed-off-by: Francis Ginther <email address hidden>

627f80d... by Francis Ginther on 2023-01-26

python2to3: results are now treated as str

The results file parsed by `results2junit.py` is now read as a python
str, so no need to perform the extra text decoding.

Signed-off-by: Francis Ginther <email address hidden>

0dae080... by Francis Ginther on 2023-01-25

python2to3: fix relative imports

Signed-off-by: Francis Ginther <email address hidden>

8e1c0bd... by Francis Ginther on 2023-01-25

python2to3: Remove duplicate ini config file sections

The python3 config file reader is now more strict about duplicate
sections in ini files.

Signed-off-by: Francis Ginther <email address hidden>

diff --git a/__init__.py b/__init__.py
index 28fbcb9..5dd3a81 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,3 @@
 __all__ = ['client', 'common']
-import client
-import common
+from . import client
+from . import common
diff --git a/cli/acl_unittest.py b/cli/acl_unittest.py
index 2fe15f2..341bed8 100755
--- a/cli/acl_unittest.py
+++ b/cli/acl_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -10,7 +10,7 @@ import sys
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import topic_common, action_common, acl, cli_mock
 
 
@@ -45,7 +45,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
         self.assertRaises(cli_mock.ExitException, acl_list.parse)
         (out, err) = self.god.unmock_io()
         self.god.check_playback()
-        self.assert_(err.find('usage'))
+        self.assertTrue(err.find('usage'))
 
     def test_parse_list_acl_user(self):
         sys.argv = ['atest', 'acl0', '-u', 'user']
@@ -74,7 +74,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
     def test_execute_list_all_acls(self):
         self.run_cmd(argv=['atest', 'acl', 'list', '-v'],
                      rpcs=[('get_acl_groups', {}, True,
-                            [{'id': 1L,
+                            [{'id': 1,
                               'name': 'Everyone',
                               'description': '',
                               'users': ['debug_user'],
@@ -84,7 +84,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
     def test_execute_list_acls_for_acl(self):
         self.run_cmd(argv=['atest', 'acl', 'list', 'acl0'],
                      rpcs=[('get_acl_groups', {'name__in': ['acl0']}, True,
-                            [{'id': 1L,
+                            [{'id': 1,
                               'name': 'Everyone',
                               'description': '',
                               'users': ['user0'],
@@ -94,7 +94,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
     def test_execute_list_acls_for_user(self):
         self.run_cmd(argv=['atest', 'acl', 'list', '-v', '--user', 'user0'],
                      rpcs=[('get_acl_groups', {'users__login': 'user0'}, True,
-                            [{'id': 1L,
+                            [{'id': 1,
                               'name': 'Everyone',
                               'description': '',
                               'users': ['user0'],
@@ -105,7 +105,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'acl', 'list', '-m', 'host0'],
                      rpcs=[('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{'id': 1L,
+                            [{'id': 1,
                               'name': 'Everyone',
                               'description': '',
                               'users': ['user0'],
@@ -117,7 +117,7 @@ class acl_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'acl', 'list', '-m', 'host0', '-v'],
                      rpcs=[('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{'id': 1L,
+                            [{'id': 1,
                               'name': 'Everyone',
                               'description': '',
                               'users': ['user0'],
@@ -169,7 +169,7 @@ class acl_create_unittest(cli_mock.cli_unittest):
                             {'description': 'my_favorite_acl',
                              'name': 'acl0'},
                             True,
-                            3L)],
+                            3)],
                      out_words_ok=['acl0'])
 
     def test_acl_create_duplicate_acl(self):
diff --git a/cli/action_common.py b/cli/action_common.py
index ae0784a..062498a 100644
--- a/cli/action_common.py
+++ b/cli/action_common.py
@@ -76,13 +76,13 @@ class atest_list(topic_common.atest):
     def check_for_wildcard(self, filters, check_results):
         """Check if there is a wilcard (only * for the moment)
         and replace the request appropriately"""
-        for (key, values) in filters.iteritems():
-            if isinstance(values, types.StringTypes):
+        for (key, values) in filters.items():
+            if isinstance(values, (str,)):
                 self._convert_name_wildcard(key, values,
                                             filters, check_results)
                 continue
 
-            if isinstance(values, types.ListType):
+            if isinstance(values, list):
                 if len(values) == 1:
                     self._convert_in_wildcard(key, values[0],
                                               filters, check_results)
@@ -104,7 +104,7 @@ class atest_list(topic_common.atest):
 
         results = self.execute_rpc(op, **filters)
 
-        for dbkey in filters.keys():
+        for dbkey in list(filters.keys()):
             if not check_results.get(dbkey, None):
                 # Don't want to check the results
                 # for this key
@@ -205,7 +205,7 @@ class atest_add_or_remove(topic_common.atest):
             self.execute_rpc(op=op,                       # The opcode
                              **{'id': item, what: uhs})   # The data
             setattr(self, 'good_%s' % what, uhs)
-        except topic_common.CliError, full_error:
+        except topic_common.CliError as full_error:
             bad_uhs = self.parse_json_exception(full_error)
             good_uhs = list(set(uhs) - set(bad_uhs))
             if bad_uhs and good_uhs:
@@ -242,7 +242,7 @@ class atest_add_or_remove(topic_common.atest):
                     self._add_remove_uh_to_topic(item, what)
                 except AttributeError:
                     pass
-                except topic_common.CliError, err:
+                except topic_common.CliError as err:
                     # The error was already logged by
                     # self.failure()
                     pass
@@ -251,13 +251,13 @@ class atest_add_or_remove(topic_common.atest):
 
         results = {}
         for thing in self.add_remove_things:
-            things_ok = [item for item, what in oks.items() if thing in what]
+            things_ok = [item for item, what in list(oks.items()) if thing in what]
             results[thing] = things_ok
 
         return results
 
     def output(self, results):
-        for thing, single_thing in self.add_remove_things.iteritems():
+        for thing, single_thing in self.add_remove_things.items():
             # Enclose each of the elements in a single quote.
             things_ok = ["'%s'" % t for t in results[thing]]
             if things_ok:
diff --git a/cli/action_common_unittest.py b/cli/action_common_unittest.py
index 7cfc336..7b4d70f 100755
--- a/cli/action_common_unittest.py
+++ b/cli/action_common_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -11,7 +11,7 @@ import copy
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, action_common, rpc
 
 #
@@ -88,16 +88,16 @@ class atest_list_unittest(cli_mock.cli_unittest):
         self.assertEqual(checks, orig_checks)
 
     def _atest_list_execute(self, filters={}, check_results={}):
-        values = [{u'id': 180,
-                   u'platform': 0,
-                   u'name': u'label0',
-                   u'invalid': 0,
-                   u'kernel_config': u''},
-                  {u'id': 338,
-                   u'platform': 0,
-                   u'name': u'label1',
-                   u'invalid': 0,
-                   u'kernel_config': u''}]
+        values = [{'id': 180,
+                   'platform': 0,
+                   'name': 'label0',
+                   'invalid': 0,
+                   'kernel_config': ''},
+                  {'id': 338,
+                   'platform': 0,
+                   'name': 'label1',
+                   'invalid': 0,
+                   'kernel_config': ''}]
         mytest = action_common.atest_list()
         mytest.afe = rpc.afe_comm()
         self.mock_rpcs([('get_labels',
@@ -131,8 +131,8 @@ class atest_list_unittest(cli_mock.cli_unittest):
         filters['name__in'] = ['label0', 'label1', 'label2']
         check_results['name__in'] = 'name'
         (out, err, errors) = self._atest_list_execute(filters, check_results)
-        K = errors.keys()[0]
-        V = errors.values()[0].keys()[0]
+        K = list(errors.keys())[0]
+        V = list(errors.values())[0].keys()[0]
         self.assertTrue('Unknown' in K)
         self.assertTrue('label2' in V)
 
@@ -149,16 +149,16 @@ class atest_list_unittest(cli_mock.cli_unittest):
         check_results = {}
         filters['name__in'] = ['label*']
         check_results['name__in'] = 'name'
-        values = [{u'id': 180,
-                   u'platform': False,
-                   u'name': u'label0',
-                   u'invalid': False,
-                   u'kernel_config': u''},
-                  {u'id': 338,
-                   u'platform': False,
-                   u'name': u'label1',
-                   u'invalid': False,
-                   u'kernel_config': u''}]
+        values = [{'id': 180,
+                   'platform': False,
+                   'name': 'label0',
+                   'invalid': False,
+                   'kernel_config': ''},
+                  {'id': 338,
+                   'platform': False,
+                   'name': 'label1',
+                   'invalid': False,
+                   'kernel_config': ''}]
         mytest = action_common.atest_list()
         mytest.afe = rpc.afe_comm()
         self.mock_rpcs([('get_labels', {'name__startswith': 'label'},
@@ -198,7 +198,7 @@ class atest_create_or_delete_unittest(cli_mock.cli_unittest):
                          True, 42)])
         ret = acr.execute()
         self.god.check_playback()
-        self.assert_(['label0'], ret)
+        self.assertTrue(['label0'], ret)
 
     def test_execute_create_two_topics(self):
         acr = self._create_cr_del(['label0', 'label1'])
diff --git a/cli/atest.py b/cli/atest.py
index 1525cac..5348da4 100644
--- a/cli/atest.py
+++ b/cli/atest.py
@@ -51,7 +51,7 @@ import traceback
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import topic_common
 
 
@@ -128,7 +128,7 @@ def main():
             results = action_obj.execute()
         except topic_common.CliError:
             pass
-        except Exception, err:
+        except Exception as err:
             traceback.print_exc()
             action_obj.generic_error("Unexpected exception: %s" % err)
         else:
diff --git a/cli/atest_unittest.py b/cli/atest_unittest.py
index 62ee817..7de0f5a 100755
--- a/cli/atest_unittest.py
+++ b/cli/atest_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -7,12 +7,12 @@
 import unittest
 import os
 import sys
-import StringIO
+import io
 
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock
 
 
diff --git a/cli/atomicgroup_unittest.py b/cli/atomicgroup_unittest.py
index f08f10e..12ee6cf 100755
--- a/cli/atomicgroup_unittest.py
+++ b/cli/atomicgroup_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2 -u
+#!/usr/bin/python3 -u
 
 """Tests for atomicgroup."""
 
@@ -7,7 +7,7 @@ import unittest
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, topic_common, atomicgroup
 
 
diff --git a/cli/autotest-rpc-change-protection-level b/cli/autotest-rpc-change-protection-level
index d40e979..0f4485a 100755
--- a/cli/autotest-rpc-change-protection-level
+++ b/cli/autotest-rpc-change-protection-level
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 # change_protection_level.py "No protection" machine1 machine2 machine3
 
diff --git a/cli/autotest-rpc-client b/cli/autotest-rpc-client
index 60dd909..80087cc 100755
--- a/cli/autotest-rpc-client
+++ b/cli/autotest-rpc-client
@@ -1,4 +1,4 @@
-#!/usr/bin/python2 -u
+#!/usr/bin/python3 -u
 
 import sys
 try:
diff --git a/cli/autotest-rpc-migrate-host b/cli/autotest-rpc-migrate-host
index 5374ab9..28ee58e 100755
--- a/cli/autotest-rpc-migrate-host
+++ b/cli/autotest-rpc-migrate-host
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 # Copyright Google, Martin J. Bligh <[e-mail]>, Jan 2009
 import os
 import sys
diff --git a/cli/autotest-rpc-query-keyvals b/cli/autotest-rpc-query-keyvals
index e0a0306..efc296f 100755
--- a/cli/autotest-rpc-query-keyvals
+++ b/cli/autotest-rpc-query-keyvals
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import sys
 import optparse
diff --git a/cli/autotest-rpc-query-results b/cli/autotest-rpc-query-results
index 462a6b9..692b242 100755
--- a/cli/autotest-rpc-query-results
+++ b/cli/autotest-rpc-query-results
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 """
 Selects all rows and columns that satisfy the condition specified
 and prints the matrix.
diff --git a/cli/cli_mock.py b/cli/cli_mock.py
index 0c69f0f..7fb56cd 100644
--- a/cli/cli_mock.py
+++ b/cli/cli_mock.py
@@ -6,12 +6,12 @@
 import unittest
 import os
 import sys
-import StringIO
+import io
 
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import atest, topic_common, rpc
 from autotest.frontend.afe import rpc_client_lib
 from autotest.frontend.afe.json_rpc import proxy
@@ -54,10 +54,10 @@ class cli_unittest(unittest.TestCase):
 
     def assertWords(self, string, to_find=[], not_in=[]):
         for word in to_find:
-            self.assert_(string.find(word) >= 0,
+            self.assertTrue(string.find(word) >= 0,
                          "Could not find '%s' in: %s" % (word, string))
         for word in not_in:
-            self.assert_(string.find(word) < 0,
+            self.assertTrue(string.find(word) < 0,
                          "Found (and shouldn't have) '%s' in: %s" % (word,
                                                                      string))
 
diff --git a/cli/contrib/why_isnt_my_job_running.py b/cli/contrib/why_isnt_my_job_running.py
index 9bc7e4f..0b59b56 100755
--- a/cli/contrib/why_isnt_my_job_running.py
+++ b/cli/contrib/why_isnt_my_job_running.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import sys
 import optparse
@@ -29,7 +29,7 @@ proxy = rpc.afe_comm(autotest_host)
 # job exists?
 jobs = proxy.run('get_jobs', id=job_id)
 if not jobs:
-    print 'No such job', job_id
+    print('No such job', job_id)
     sys.exit(1)
 job = jobs[0]
 owner = job['owner']
@@ -42,8 +42,8 @@ queue_entries = proxy.run('get_host_queue_entries', job__id=job_id)
 # Divine why an atomic group job is or is not running.
 if queue_entries and queue_entries[0]['atomic_group']:
     if queue_entries[0]['status'] in RUNNING_HQE_STATUSES:
-        print 'Job %d appears to have started (status: %s).' % (
-            job_id, queue_entries[0]['status'])
+        print('Job %d appears to have started (status: %s).' % (
+            job_id, queue_entries[0]['status']))
         sys.exit(0)
     # Hosts in Repairing or Repair Failed will have Queued queue entries.
     # We shouldn't consider those queue entries as a multi-group job.
@@ -53,7 +53,7 @@ if queue_entries and queue_entries[0]['atomic_group']:
             if queue_entry['host']['status'].startswith('Repair'):
                 repair_hostnames.append(queue_entry['host']['hostname'])
         if queue_entry['status'] in ('Completed', 'Stopped'):
-            print 'This job has already finished.'
+            print('This job has already finished.')
             sys.exit(0)
     queue_entries_with_hosts = [queue_entry for queue_entry in queue_entries
                                 if queue_entry['host']]
@@ -66,25 +66,25 @@ if queue_entries and queue_entries[0]['atomic_group']:
         # but is not running because too many of them are in Repairing or will
         # never run because hosts have exited Repairing into the Repair Failed
         # dead end.
-        print 'This script does not support multi-group atomic group jobs.'
-        print
-        print 'Jobs scheduled in that state are typically unintentional.'
-        print
-        print 'Did you perhaps schedule the job via the web frontend and ask'
-        print 'that it run on more than 1 (atomic group) of hosts via the '
-        print '"Run on any" box?  If so, always enter 1 there when scheduling'
-        print 'jobs on anything marked "(atomic group)".'
-        print
-        print len(queue_entries), 'non-started atomic group HostQueueEntries',
-        print 'found for job', job_id
+        print('This script does not support multi-group atomic group jobs.')
+        print()
+        print('Jobs scheduled in that state are typically unintentional.')
+        print()
+        print('Did you perhaps schedule the job via the web frontend and ask')
+        print('that it run on more than 1 (atomic group) of hosts via the ')
+        print('"Run on any" box?  If so, always enter 1 there when scheduling')
+        print('jobs on anything marked "(atomic group)".')
+        print()
+        print(len(queue_entries), 'non-started atomic group HostQueueEntries', end=' ')
+        print('found for job', job_id)
         sys.exit(1)
     atomic_group_name = queue_entries[0]['atomic_group']['name']
     # Get the list of labels associated with this atomic group.
     atomic_labels = proxy.run('get_labels',
                               atomic_group__name=atomic_group_name)
     if len(atomic_labels) < 1:
-        print 'Job requests atomic group %s but no labels' % atomic_group_name
-        print '(and thus no hosts) are associated with that atomic group.'
+        print('Job requests atomic group %s but no labels' % atomic_group_name)
+        print('(and thus no hosts) are associated with that atomic group.')
 
     job_sync_count = job['synch_count']
     # Ugh! This is returned as a comma separated str of label names.
@@ -110,16 +110,16 @@ if queue_entries and queue_entries[0]['atomic_group']:
     for label in atomic_labels:
         label_name = label['name']
         if meta_host and meta_host_name != label_name:
-            print 'Cannot run on atomic label %s due to meta_host %s.' % (
-                label_name, meta_host_name)
+            print('Cannot run on atomic label %s due to meta_host %s.' % (
+                label_name, meta_host_name))
             continue
         for dep_name in job_dependency_label_names:
             if dep_name != label_name:
-                print 'Not checking hosts in atomic label %s against' % (
-                    label_name,)
-                print 'job dependency label %s.  There may be less hosts' % (
-                    dep_name,)
-                print 'than examined below available to run this job.'
+                print('Not checking hosts in atomic label %s against' % (
+                    label_name,))
+                print('job dependency label %s.  There may be less hosts' % (
+                    dep_name,))
+                print('than examined below available to run this job.')
 
         # Get the list of hosts associated with this atomic group label.
         atomic_hosts = proxy.run('get_hosts', multiple_labels=[label_name])
@@ -186,22 +186,22 @@ if queue_entries and queue_entries[0]['atomic_group']:
         else:
             runnable_atomic_label_names[label_name] = usable_hostnames
 
-    for label_name, reason_tuple in atomic_label_exclude_reasons.iteritems():
+    for label_name, reason_tuple in atomic_label_exclude_reasons.items():
         job_reason, hosts_reasons = reason_tuple
-        print 'Atomic group "%s" via label "%s" CANNOT run job %d because:' % (
-            atomic_group_name, label_name, job_id)
-        print job_reason
+        print('Atomic group "%s" via label "%s" CANNOT run job %d because:' % (
+            atomic_group_name, label_name, job_id))
+        print(job_reason)
         for hostname in sorted(hosts_reasons.keys()):
             for reason in hosts_reasons[hostname]:
-                print '%s\t%s' % (hostname, reason)
-        print
+                print('%s\t%s' % (hostname, reason))
+        print()
 
-    for label_name, host_list in runnable_atomic_label_names.iteritems():
-        print 'Atomic group "%s" via label "%s" is READY to run job %d on:' % (
-            atomic_group_name, label_name, job_id)
-        print ', '.join(host_list)
-        print 'Is the job scheduler healthy?'
-        print
+    for label_name, host_list in runnable_atomic_label_names.items():
+        print('Atomic group "%s" via label "%s" is READY to run job %d on:' % (
+            atomic_group_name, label_name, job_id))
+        print(', '.join(host_list))
+        print('Is the job scheduler healthy?')
+        print()
 
     sys.exit(0)
 
@@ -213,7 +213,7 @@ if len(args) != 2:
         hostname = queue_entries[0]['host']['hostname']
     else:
         parser.print_help()
-        print '\nERROR: A hostname associated with the job is required.'
+        print('\nERROR: A hostname associated with the job is required.')
         sys.exit(1)
 else:
     hostname = args[1]
@@ -221,7 +221,7 @@ else:
 # host exists?
 hosts = proxy.run('get_hosts', hostname=hostname)
 if not hosts:
-    print 'No such host', hostname
+    print('No such host', hostname)
     sys.exit(1)
 host = hosts[0]
 
@@ -243,8 +243,8 @@ if entries_for_this_host:
         'Multiple entries for this job assigned to this host!')
     entry = entries_for_this_host[0]
     if entry['active'] or entry['complete']:
-        print ('Job already ran or is running on this host! (status: %s)' %
-               entry['full_status'])
+        print(('Job already ran or is running on this host! (status: %s)' %
+               entry['full_status']))
         sys.exit(0)
     is_metahost = False
 else:
@@ -265,8 +265,8 @@ if host_atomic_group_labels:
     for label in host_atomic_group_labels:
         atomic_groups.add(label['atomic_group']['name'])
     if len(atomic_groups) != 1:
-        print 'Host has more than one atomic group!'
-        print list(atomic_groups)
+        print('Host has more than one atomic group!')
+        print(list(atomic_groups))
         sys.exit(1)
     host_atomic_group_label = host_atomic_group_labels[0]
     host_atomic_group_name = host_atomic_group_label['atomic_group']['name']
@@ -279,15 +279,15 @@ if job_atomic_group:
     job_atomic_group_name = job_atomic_group['name']
 
 if host_atomic_group_name != job_atomic_group_name:
-    print ('Job is for atomic group %s, but host is in atomic group %s '
+    print(('Job is for atomic group %s, but host is in atomic group %s '
            '(label %s)' %
            (job_atomic_group_name, host_atomic_group_name,
-            host_atomic_group_label['name']))
+            host_atomic_group_label['name'])))
     job_will_run = False
 
 # host locked?
 if host['locked']:
-    print 'Host is locked by', host['locked_by'], 'no jobs will schedule on it.'
+    print('Host is locked by', host['locked_by'], 'no jobs will schedule on it.')
     job_will_run = False
 
 # acl accessible?
@@ -298,9 +298,9 @@ if not accessible:
                           proxy.run('get_acl_groups', hosts__hostname=hostname))
     owner_acls = ', '.join(group['name'] for group in
                            proxy.run('get_acl_groups', users__login=owner))
-    print 'Host not ACL-accessible to job owner', owner
-    print ' Host ACLs:', host_acls
-    print ' Owner Acls:', owner_acls
+    print('Host not ACL-accessible to job owner', owner)
+    print(' Host ACLs:', host_acls)
+    print(' Owner Acls:', owner_acls)
     job_will_run = False
 
 # meets dependencies?
@@ -310,8 +310,8 @@ if job_deps_list != ['']:
     job_deps = set(job_deps_list)
 unmet = job_deps - host_label_names
 if unmet:
-    print ("Host labels (%s) don't satisfy job dependencies: %s" %
-           (', '.join(host_label_names), ', '.join(unmet)))
+    print(("Host labels (%s) don't satisfy job dependencies: %s" %
+           (', '.join(host_label_names), ', '.join(unmet))))
     job_will_run = False
 
 # at this point, if the job is for an unassigned atomic group, things are too
@@ -333,8 +333,8 @@ if is_metahost:
         unmet_exclusive_label = (label['only_if_needed'] and
                                  label['name'] not in job_deps_and_metahosts)
         if unmet_exclusive_label:
-            print ('Host contains "only if needed" label %s, unused by job '
-                   'dependencies and metahosts' % label['name'])
+            print(('Host contains "only if needed" label %s, unused by job '
+                   'dependencies and metahosts' % label['name']))
             job_will_run = False
 
 # host ready?
@@ -343,17 +343,17 @@ if host['status'] != 'Ready':
         active = proxy.run('get_host_queue_entries',
                            host=host['id'], active=True)
         if not active:
-            print ('Host %s seems to be in "Pending" state incorrectly; please '
-                   'report this to the Autotest team' % hostname)
+            print(('Host %s seems to be in "Pending" state incorrectly; please '
+                   'report this to the Autotest team' % hostname))
             sys.exit(1)
-    print 'Host not in "Ready" status (status="%s")' % host['status']
+    print('Host not in "Ready" status (status="%s")' % host['status'])
     job_will_run = False
 
 if job_will_run:
-    print ("Job %s should run on host %s; if you've already waited about ten "
+    print(("Job %s should run on host %s; if you've already waited about ten "
            "minutes or longer, it's probably a server issue or a bug." %
-           (job_id, hostname))
+           (job_id, hostname)))
     sys.exit(1)
 else:
-    print "All of the reasons this job is not running are listed above."
+    print("All of the reasons this job is not running are listed above.")
     sys.exit(0)
diff --git a/cli/host.py b/cli/host.py
index 24be9af..e0927fd 100644
--- a/cli/host.py
+++ b/cli/host.py
@@ -232,7 +232,7 @@ class host_stat(host):
 
     def output(self, results):
         for stats, acls, labels in results:
-            print '-' * 5
+            print('-' * 5)
             self.print_fields(stats,
                               keys=['hostname', 'platform',
                                     'status', 'locked', 'locked_by',
@@ -291,8 +291,8 @@ class host_jobs(host):
 
     def output(self, results):
         for host, jobs in results:
-            print '-' * 5
-            print 'Hostname: %s' % host
+            print('-' * 5)
+            print('Hostname: %s' % host)
             self.print_table(jobs, keys_header=['job_id',
                                                 'job_owner',
                                                 'job_name',
@@ -346,7 +346,7 @@ class host_mod(host):
                 # TODO: Make the AFE return True or False,
                 # especially for lock
                 successes.append(host)
-            except topic_common.CliError, full_error:
+            except topic_common.CliError as full_error:
                 # Already logged by execute_rpc()
                 pass
 
diff --git a/cli/host_unittest.py b/cli/host_unittest.py
index 7d67791..bbcfd40 100755
--- a/cli/host_unittest.py
+++ b/cli/host_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -11,7 +11,7 @@ import sys
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, host
 
 
@@ -113,26 +113,26 @@ class host_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'host', 'list', '--ignore_site_file'],
                      rpcs=[('get_hosts', {},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': None,
-                              u'id': 1},
-                             {u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': [],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': None,
+                              'id': 1},
+                             {'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2}])],
                      out_words_ok=['host0', 'host1', 'Ready',
                                    'plat1', 'False', 'True'])
 
@@ -140,26 +140,26 @@ class host_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'host', 'list', '--ignore_site_file'],
                      rpcs=[('get_hosts', {},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label0', u'label1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': None,
-                              u'id': 1},
-                             {u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label0', 'label1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': None,
+                              'id': 1},
+                             {'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2}])],
                      out_words_ok=['host0', 'host1', 'Ready', 'plat1',
                                    'label0', 'label1', 'label2', 'label3',
                                    'False', 'True'])
@@ -169,16 +169,16 @@ class host_list_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'hostname__in': ['host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True'],
                      out_words_no=['host0', 'host2',
@@ -191,26 +191,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                      # This is a bit fragile as the list order may change...
                      rpcs=[('get_hosts', {'hostname__in': ['host2', 'host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -224,16 +224,16 @@ class host_list_unittest(cli_mock.cli_unittest):
                      # This is a bit fragile as the list order may change...
                      rpcs=[('get_hosts', {'hostname__in': ['host2', 'host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['Ready', 'plat1',
                                    'label3', 'label4', 'True'],
                      out_words_no=['host1', 'False'],
@@ -256,26 +256,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                            '-b', 'label3', '--ignore_site_file'],
                      rpcs=[('get_hosts', {'labels__name__in': ['label3']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -287,26 +287,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_hosts', {'multiple_labels': ['label2',
                                                               'label3']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host3',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label2', u'plat2'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat2',
-                              u'id': 4}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host3',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label2', 'plat2'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat2',
+                              'id': 4}])],
                      out_words_ok=['host1', 'host3', 'Ready', 'plat0',
                                    'label2', 'label3', 'plat2'],
                      out_words_no=['host2', 'label4', 'False', 'plat1'])
@@ -319,17 +319,17 @@ class host_list_unittest(cli_mock.cli_unittest):
                                                               'label3',
                                                               'label4']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label2', u'label4',
-                                          u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label2', 'label4',
+                                          'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host2', 'plat1',
                                    'label2', 'label3', 'label4'],
                      out_words_no=['host1', 'host3'])
@@ -341,17 +341,17 @@ class host_list_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_hosts',
                             {'labels__name__startswith': 'label'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': 1,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label2', u'label4',
-                                          u'plat1'],
-                              u'invalid': 0,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': 1,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label2', 'label4',
+                                          'plat1'],
+                              'invalid': 0,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host2', 'plat1',
                                    'label2', 'label3', 'label4'],
                      out_words_no=['host1', 'host3'])
@@ -373,26 +373,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_hosts', {'labels__name__in': ['label3'],
                                           'hostname__in': ['host2', 'host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -414,26 +414,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                            '-s', 'Ready', '--ignore_site_file'],
                      rpcs=[('get_hosts', {'status__in': ['Ready']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -445,26 +445,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_hosts', {'status__in': ['Ready'],
                                           'hostname__in': ['host2', 'host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -500,26 +500,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_hosts', {'locked': True,
                                           'hostname__in': ['host2', 'host1']},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': True,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': True,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'True',
                                    'host2', 'label4'],
@@ -530,26 +530,26 @@ class host_list_unittest(cli_mock.cli_unittest):
                            '--unlocked', '--ignore_site_file'],
                      rpcs=[('get_hosts', {'locked': False},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label2', u'label3', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 2},
-                             {u'status': u'Ready',
-                              u'hostname': u'host2',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}])],
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label2', 'label3', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 2},
+                             {'status': 'Ready',
+                              'hostname': 'host2',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}])],
                      out_words_ok=['host1', 'Ready', 'plat1',
                                    'label2', 'label3', 'False',
                                    'host2', 'label4'],
@@ -564,68 +564,68 @@ class host_stat_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'hostname': 'host1'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'locked_by': 'user0',
-                              u'protection': 'No protection',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'lock_time': '2008-07-23 12:54:15',
+                              'locked_by': 'user0',
+                              'protection': 'No protection',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3}]),
                            ('get_hosts', {'hostname': 'host0'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'protection': u'No protection',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'protection': 'No protection',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_acl_groups', {'hosts__hostname': 'host1'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user2', u'debug_user', u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user2', 'debug_user', 'user0']}]),
                            ('get_labels', {'host__hostname': 'host1'},
                             True,
-                            [{u'id': 2,
-                              u'platform': 1,
-                              u'name': u'jme',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 2,
+                              'platform': 1,
+                              'name': 'jme',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'myacl0',
-                              u'hosts': [u'host0'],
-                              u'id': 2,
-                              u'name': u'acl0',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'myacl0',
+                              'hosts': ['host0'],
+                              'id': 2,
+                              'name': 'acl0',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'host0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}])],
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}])],
                      out_words_ok=['host0', 'host1', 'plat0', 'plat1',
                                    'Everyone', 'acl0', 'label0'])
 
@@ -637,41 +637,41 @@ class host_stat_unittest(cli_mock.cli_unittest):
                             []),
                            ('get_hosts', {'hostname': 'host0'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'protection': u'No protection',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'protection': 'No protection',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'myacl0',
-                              u'hosts': [u'host0'],
-                              u'id': 2,
-                              u'name': u'acl0',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'myacl0',
+                              'hosts': ['host0'],
+                              'id': 2,
+                              'name': 'acl0',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'host0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}])],
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}])],
                      out_words_ok=['host0', 'plat0',
                                    'Everyone', 'acl0', 'label0'],
                      out_words_no=['host1'],
@@ -686,41 +686,41 @@ class host_stat_unittest(cli_mock.cli_unittest):
                             []),
                            ('get_hosts', {'hostname': 'host0'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'protection': u'No protection',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'protection': 'No protection',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'myacl0',
-                              u'hosts': [u'host0'],
-                              u'id': 2,
-                              u'name': u'acl0',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'myacl0',
+                              'hosts': ['host0'],
+                              'id': 2,
+                              'name': 'acl0',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'host0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}])],
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}])],
                      out_words_ok=['host0', 'plat0',
                                    'Everyone', 'acl0', 'label0'],
                      out_words_no=['host1'],
@@ -733,66 +733,66 @@ class host_stat_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'hostname__startswith': 'ho'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'locked_by': 'user0',
-                              u'protection': 'No protection',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3},
-                             {u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'protection': u'No protection',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'lock_time': '2008-07-23 12:54:15',
+                              'locked_by': 'user0',
+                              'protection': 'No protection',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3},
+                             {'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'protection': 'No protection',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_acl_groups', {'hosts__hostname': 'host1'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user2', u'debug_user', u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user2', 'debug_user', 'user0']}]),
                            ('get_labels', {'host__hostname': 'host1'},
                             True,
-                            [{u'id': 2,
-                              u'platform': 1,
-                              u'name': u'jme',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 2,
+                              'platform': 1,
+                              'name': 'jme',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'myacl0',
-                              u'hosts': [u'host0'],
-                              u'id': 2,
-                              u'name': u'acl0',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'myacl0',
+                              'hosts': ['host0'],
+                              'id': 2,
+                              'name': 'acl0',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'host0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}])],
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}])],
                      out_words_ok=['host0', 'host1', 'plat0', 'plat1',
                                    'Everyone', 'acl0', 'label0'])
 
@@ -802,103 +802,103 @@ class host_stat_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'hostname': 'newhost0'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'newhost0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'protection': u'No protection',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 5}]),
+                            [{'status': 'Ready',
+                              'hostname': 'newhost0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'protection': 'No protection',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 5}]),
                            ('get_hosts', {'hostname__startswith': 'ho'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'locked_by': 'user0',
-                              u'protection': 'No protection',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3},
-                             {u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'protection': 'No protection',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'lock_time': '2008-07-23 12:54:15',
+                              'locked_by': 'user0',
+                              'protection': 'No protection',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3},
+                             {'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'protection': 'No protection',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_acl_groups', {'hosts__hostname': 'newhost0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'newhost0', 'host1'],
-                              u'id': 42,
-                              u'name': u'my_acl',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'my favorite acl',
-                              u'hosts': [u'newhost0'],
-                              u'id': 2,
-                              u'name': u'acl10',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['newhost0', 'host1'],
+                              'id': 42,
+                              'name': 'my_acl',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'my favorite acl',
+                              'hosts': ['newhost0'],
+                              'id': 2,
+                              'name': 'acl10',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'newhost0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'hosts__hostname': 'host1'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user2', u'debug_user', u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user2', 'debug_user', 'user0']}]),
                            ('get_labels', {'host__hostname': 'host1'},
                             True,
-                            [{u'id': 2,
-                              u'platform': 1,
-                              u'name': u'jme',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 2,
+                              'platform': 1,
+                              'name': 'jme',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'hosts__hostname': 'host0'},
                             True,
-                            [{u'description': u'',
-                              u'hosts': [u'host0', u'host1'],
-                              u'id': 1,
-                              u'name': u'Everyone',
-                              u'users': [u'user0', u'debug_user']},
-                             {u'description': u'myacl0',
-                              u'hosts': [u'host0'],
-                              u'id': 2,
-                              u'name': u'acl0',
-                              u'users': [u'user0']}]),
+                            [{'description': '',
+                              'hosts': ['host0', 'host1'],
+                              'id': 1,
+                              'name': 'Everyone',
+                              'users': ['user0', 'debug_user']},
+                             {'description': 'myacl0',
+                              'hosts': ['host0'],
+                              'id': 2,
+                              'name': 'acl0',
+                              'users': ['user0']}]),
                            ('get_labels', {'host__hostname': 'host0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''},
-                             {u'id': 5,
-                              u'platform': 1,
-                              u'name': u'plat0',
-                              u'invalid': False,
-                              u'kernel_config': u''}])],
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''},
+                             {'id': 5,
+                              'platform': 1,
+                              'name': 'plat0',
+                              'invalid': False,
+                              'kernel_config': ''}])],
                      out_words_ok=['host0', 'host1', 'newhost0',
                                    'plat0', 'plat1',
                                    'Everyone', 'acl10', 'label0'])
@@ -913,19 +913,19 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                             {'host__hostname': 'host0', 'query_limit': 20,
                              'sort_by': ['-job__id']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                        u'locked': True,
-                                        u'locked_by': 'user0',
-                                        u'hostname': u'host0',
-                                        u'invalid': False,
-                                        u'id': 3232,
-                                        u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': u'meta0',
-                              u'job': {u'control_file':
-                                       (u"def step_init():\n"
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                        'locked': True,
+                                        'locked_by': 'user0',
+                                        'hostname': 'host0',
+                                        'invalid': False,
+                                        'id': 3232,
+                                        'synch_id': None},
+                              'priority': 0,
+                              'meta_host': 'meta0',
+                              'job': {'control_file':
+                                       ("def step_init():\n"
                                         "\tjob.next_step([step_test])\n"
                                         "\ttestkernel = job.kernel("
                                         "'kernel-smp-2.6.xyz.x86_64.rpm')\n"
@@ -933,41 +933,41 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                                         "\ttestkernel.boot()\n\n"
                                         "def step_test():\n"
                                         "\tjob.run_test('kernbench')\n\n"),
-                                       u'name': u'kernel-smp-2.6.xyz.x86_64',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': None,
-                                       u'priority': u'Low',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-01-09 10:45:12',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 216},
-                              u'active': 0,
-                              u'id': 2981},
-                             {u'status': u'Aborted',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                         u'locked': True,
-                                         u'locked_by': 'user0',
-                                         u'hostname': u'host0',
-                                         u'invalid': False,
-                                         u'id': 3232,
-                                         u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': None,
-                              u'job': {u'control_file':
-                                       u"job.run_test('sleeptest')\n\n",
-                                       u'name': u'testjob',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Low',
-                                       u'owner': u'user1',
-                                       u'created_on': u'2008-01-17 15:04:53',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 289},
-                              u'active': 0,
-                              u'id': 3167}])],
+                                       'name': 'kernel-smp-2.6.xyz.x86_64',
+                                       'control_type': 'Client',
+                                       'synchronizing': None,
+                                       'priority': 'Low',
+                                       'owner': 'user0',
+                                       'created_on': '2008-01-09 10:45:12',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 216},
+                              'active': 0,
+                              'id': 2981},
+                             {'status': 'Aborted',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                         'locked': True,
+                                         'locked_by': 'user0',
+                                         'hostname': 'host0',
+                                         'invalid': False,
+                                         'id': 3232,
+                                         'synch_id': None},
+                              'priority': 0,
+                              'meta_host': None,
+                              'job': {'control_file':
+                                       "job.run_test('sleeptest')\n\n",
+                                       'name': 'testjob',
+                                       'control_type': 'Client',
+                                       'synchronizing': 0,
+                                       'priority': 'Low',
+                                       'owner': 'user1',
+                                       'created_on': '2008-01-17 15:04:53',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 289},
+                              'active': 0,
+                              'id': 3167}])],
                      out_words_ok=['216', 'user0', 'Failed',
                                    'kernel-smp-2.6.xyz.x86_64', 'Aborted',
                                    '289', 'user1', 'Aborted',
@@ -978,43 +978,43 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'hostname__startswith': 'ho'},
                             True,
-                            [{u'status': u'Ready',
-                              u'hostname': u'host1',
-                              u'locked': True,
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'locked_by': 'user0',
-                              u'labels': [u'label3', u'label4', u'plat1'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat1',
-                              u'id': 3},
-                             {u'status': u'Ready',
-                              u'hostname': u'host0',
-                              u'locked': False,
-                              u'locked_by': 'user0',
-                              u'lock_time': u'2008-07-23 12:54:15',
-                              u'labels': [u'label0', u'plat0'],
-                              u'invalid': False,
-                              u'synch_id': None,
-                              u'platform': u'plat0',
-                              u'id': 2}]),
+                            [{'status': 'Ready',
+                              'hostname': 'host1',
+                              'locked': True,
+                              'lock_time': '2008-07-23 12:54:15',
+                              'locked_by': 'user0',
+                              'labels': ['label3', 'label4', 'plat1'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat1',
+                              'id': 3},
+                             {'status': 'Ready',
+                              'hostname': 'host0',
+                              'locked': False,
+                              'locked_by': 'user0',
+                              'lock_time': '2008-07-23 12:54:15',
+                              'labels': ['label0', 'plat0'],
+                              'invalid': False,
+                              'synch_id': None,
+                              'platform': 'plat0',
+                              'id': 2}]),
                            ('get_host_queue_entries',
                             {'host__hostname': 'host1', 'query_limit': 20,
                              'sort_by': ['-job__id']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                        u'locked': True,
-                                        u'locked_by': 'user0',
-                                        u'hostname': u'host1',
-                                        u'invalid': False,
-                                        u'id': 3232,
-                                        u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': u'meta0',
-                              u'job': {u'control_file':
-                                       (u"def step_init():\n"
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                        'locked': True,
+                                        'locked_by': 'user0',
+                                        'hostname': 'host1',
+                                        'invalid': False,
+                                        'id': 3232,
+                                        'synch_id': None},
+                              'priority': 0,
+                              'meta_host': 'meta0',
+                              'job': {'control_file':
+                                       ("def step_init():\n"
                                         "\tjob.next_step([step_test])\n"
                                         "\ttestkernel = job.kernel("
                                         "'kernel-smp-2.6.xyz.x86_64.rpm')\n"
@@ -1022,58 +1022,58 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                                         "\ttestkernel.boot()\n\n"
                                         "def step_test():\n"
                                         "\tjob.run_test('kernbench')\n\n"),
-                                       u'name': u'kernel-smp-2.6.xyz.x86_64',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': None,
-                                       u'priority': u'Low',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-01-09 10:45:12',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 216},
-                              u'active': 0,
-                              u'id': 2981},
-                             {u'status': u'Aborted',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                         u'locked': True,
-                                         u'locked_by': 'user0',
-                                         u'hostname': u'host1',
-                                         u'invalid': False,
-                                         u'id': 3232,
-                                         u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': None,
-                              u'job': {u'control_file':
-                                       u"job.run_test('sleeptest')\n\n",
-                                       u'name': u'testjob',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Low',
-                                       u'owner': u'user1',
-                                       u'created_on': u'2008-01-17 15:04:53',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 289},
-                              u'active': 0,
-                              u'id': 3167}]),
+                                       'name': 'kernel-smp-2.6.xyz.x86_64',
+                                       'control_type': 'Client',
+                                       'synchronizing': None,
+                                       'priority': 'Low',
+                                       'owner': 'user0',
+                                       'created_on': '2008-01-09 10:45:12',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 216},
+                              'active': 0,
+                              'id': 2981},
+                             {'status': 'Aborted',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                         'locked': True,
+                                         'locked_by': 'user0',
+                                         'hostname': 'host1',
+                                         'invalid': False,
+                                         'id': 3232,
+                                         'synch_id': None},
+                              'priority': 0,
+                              'meta_host': None,
+                              'job': {'control_file':
+                                       "job.run_test('sleeptest')\n\n",
+                                       'name': 'testjob',
+                                       'control_type': 'Client',
+                                       'synchronizing': 0,
+                                       'priority': 'Low',
+                                       'owner': 'user1',
+                                       'created_on': '2008-01-17 15:04:53',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 289},
+                              'active': 0,
+                              'id': 3167}]),
                            ('get_host_queue_entries',
                             {'host__hostname': 'host0', 'query_limit': 20,
                              'sort_by': ['-job__id']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                        u'locked': True,
-                                        u'locked_by': 'user0',
-                                        u'hostname': u'host0',
-                                        u'invalid': False,
-                                        u'id': 3232,
-                                        u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': u'meta0',
-                              u'job': {u'control_file':
-                                       (u"def step_init():\n"
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                        'locked': True,
+                                        'locked_by': 'user0',
+                                        'hostname': 'host0',
+                                        'invalid': False,
+                                        'id': 3232,
+                                        'synch_id': None},
+                              'priority': 0,
+                              'meta_host': 'meta0',
+                              'job': {'control_file':
+                                       ("def step_init():\n"
                                         "\tjob.next_step([step_test])\n"
                                         "\ttestkernel = job.kernel("
                                         "'kernel-smp-2.6.xyz.x86_64.rpm')\n"
@@ -1081,41 +1081,41 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                                         "\ttestkernel.boot()\n\n"
                                         "def step_test():\n"
                                         "\tjob.run_test('kernbench')\n\n"),
-                                       u'name': u'kernel-smp-2.6.xyz.x86_64',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': None,
-                                       u'priority': u'Low',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-01-09 10:45:12',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 216},
-                              u'active': 0,
-                              u'id': 2981},
-                             {u'status': u'Aborted',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                         u'locked': True,
-                                         u'locked_by': 'user0',
-                                         u'hostname': u'host0',
-                                         u'invalid': False,
-                                         u'id': 3232,
-                                         u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': None,
-                              u'job': {u'control_file':
-                                       u"job.run_test('sleeptest')\n\n",
-                                       u'name': u'testjob',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Low',
-                                       u'owner': u'user1',
-                                       u'created_on': u'2008-01-17 15:04:53',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 289},
-                              u'active': 0,
-                              u'id': 3167}])],
+                                       'name': 'kernel-smp-2.6.xyz.x86_64',
+                                       'control_type': 'Client',
+                                       'synchronizing': None,
+                                       'priority': 'Low',
+                                       'owner': 'user0',
+                                       'created_on': '2008-01-09 10:45:12',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 216},
+                              'active': 0,
+                              'id': 2981},
+                             {'status': 'Aborted',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                         'locked': True,
+                                         'locked_by': 'user0',
+                                         'hostname': 'host0',
+                                         'invalid': False,
+                                         'id': 3232,
+                                         'synch_id': None},
+                              'priority': 0,
+                              'meta_host': None,
+                              'job': {'control_file':
+                                       "job.run_test('sleeptest')\n\n",
+                                       'name': 'testjob',
+                                       'control_type': 'Client',
+                                       'synchronizing': 0,
+                                       'priority': 'Low',
+                                       'owner': 'user1',
+                                       'created_on': '2008-01-17 15:04:53',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 289},
+                              'active': 0,
+                              'id': 3167}])],
                      out_words_ok=['216', 'user0', 'Failed',
                                    'kernel-smp-2.6.xyz.x86_64', 'Aborted',
                                    '289', 'user1', 'Aborted',
@@ -1128,19 +1128,19 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                             {'host__hostname': 'host0', 'query_limit': 10,
                              'sort_by': ['-job__id']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                        u'locked': True,
-                                        u'locked_by': 'user0',
-                                        u'hostname': u'host0',
-                                        u'invalid': False,
-                                        u'id': 3232,
-                                        u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': u'meta0',
-                              u'job': {u'control_file':
-                                       (u"def step_init():\n"
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                        'locked': True,
+                                        'locked_by': 'user0',
+                                        'hostname': 'host0',
+                                        'invalid': False,
+                                        'id': 3232,
+                                        'synch_id': None},
+                              'priority': 0,
+                              'meta_host': 'meta0',
+                              'job': {'control_file':
+                                       ("def step_init():\n"
                                         "\tjob.next_step([step_test])\n"
                                         "\ttestkernel = job.kernel("
                                         "'kernel-smp-2.6.xyz.x86_64.rpm')\n"
@@ -1148,41 +1148,41 @@ class host_jobs_unittest(cli_mock.cli_unittest):
                                         "\ttestkernel.boot()\n\n"
                                         "def step_test():\n"
                                         "\tjob.run_test('kernbench')\n\n"),
-                                       u'name': u'kernel-smp-2.6.xyz.x86_64',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': None,
-                                       u'priority': u'Low',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-01-09 10:45:12',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 216},
-                              u'active': 0,
-                              u'id': 2981},
-                             {u'status': u'Aborted',
-                              u'complete': 1,
-                              u'host': {u'status': u'Ready',
-                                         u'locked': True,
-                                         u'locked_by': 'user0',
-                                         u'hostname': u'host0',
-                                         u'invalid': False,
-                                         u'id': 3232,
-                                         u'synch_id': None},
-                              u'priority': 0,
-                              u'meta_host': None,
-                              u'job': {u'control_file':
-                                       u"job.run_test('sleeptest')\n\n",
-                                       u'name': u'testjob',
-                                       u'control_type': u'Client',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Low',
-                                       u'owner': u'user1',
-                                       u'created_on': u'2008-01-17 15:04:53',
-                                       u'synch_count': None,
-                                       u'synch_type': u'Asynchronous',
-                                       u'id': 289},
-                              u'active': 0,
-                              u'id': 3167}])],
+                                       'name': 'kernel-smp-2.6.xyz.x86_64',
+                                       'control_type': 'Client',
+                                       'synchronizing': None,
+                                       'priority': 'Low',
+                                       'owner': 'user0',
+                                       'created_on': '2008-01-09 10:45:12',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 216},
+                              'active': 0,
+                              'id': 2981},
+                             {'status': 'Aborted',
+                              'complete': 1,
+                              'host': {'status': 'Ready',
+                                         'locked': True,
+                                         'locked_by': 'user0',
+                                         'hostname': 'host0',
+                                         'invalid': False,
+                                         'id': 3232,
+                                         'synch_id': None},
+                              'priority': 0,
+                              'meta_host': None,
+                              'job': {'control_file':
+                                       "job.run_test('sleeptest')\n\n",
+                                       'name': 'testjob',
+                                       'control_type': 'Client',
+                                       'synchronizing': 0,
+                                       'priority': 'Low',
+                                       'owner': 'user1',
+                                       'created_on': '2008-01-17 15:04:53',
+                                       'synch_count': None,
+                                       'synch_type': 'Asynchronous',
+                                       'id': 289},
+                              'active': 0,
+                              'id': 3167}])],
                      out_words_ok=['216', 'user0', 'Failed',
                                    'kernel-smp-2.6.xyz.x86_64', 'Aborted',
                                    '289', 'user1', 'Aborted',
@@ -1260,11 +1260,11 @@ class host_create_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_labels', {'name': 'label0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'name': 'acl0'},
                             True, []),
                            ('add_acl_group', {'name': 'acl0'},
@@ -1294,11 +1294,11 @@ class host_create_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_labels', {'name': 'label0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'name': 'acl0'},
                             True, []),
                            ('add_acl_group', {'name': 'acl0'},
@@ -1333,25 +1333,25 @@ class host_create_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_labels', {'name': 'label0'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label0',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label0',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_labels', {'name': 'label,1'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label,1',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label,1',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_labels', {'name': 'label,2'},
                             True,
-                            [{u'id': 4,
-                              u'platform': 0,
-                              u'name': u'label,2',
-                              u'invalid': False,
-                              u'kernel_config': u''}]),
+                            [{'id': 4,
+                              'platform': 0,
+                              'name': 'label,2',
+                              'invalid': False,
+                              'kernel_config': ''}]),
                            ('get_acl_groups', {'name': 'acl0'},
                             True, []),
                            ('add_acl_group', {'name': 'acl0'},
diff --git a/cli/job.py b/cli/job.py
index b69d4e0..b9c76ba 100644
--- a/cli/job.py
+++ b/cli/job.py
@@ -37,7 +37,7 @@ class job(topic_common.atest):
         for result in results:
             total = sum(result['status_counts'].values())
             status = ['%s=%s(%.1f%%)' % (key, val, 100.0 * float(val) / total)
-                      for key, val in result['status_counts'].iteritems()]
+                      for key, val in result['status_counts'].items()]
             status.sort()
             result['status_counts'] = ', '.join(status)
 
@@ -194,12 +194,12 @@ class job_stat(job_list_stat):
 
         for job in summary:
             job_id = job['id']
-            if hosts_status.has_key(job_id):
+            if job_id in hosts_status:
                 this_job = hosts_status[job_id]
                 job['hosts'] = ' '.join(' '.join(host) for host in
-                                        this_job.itervalues())
+                                        this_job.values())
                 host_per_status = ['%s="%s"' % (status, ' '.join(host))
-                                   for status, host in this_job.iteritems()]
+                                   for status, host in this_job.items()]
                 job['hosts_status'] = ', '.join(host_per_status)
                 if self.status_list:
                     statuses = set(s.lower() for s in self.status_list)
@@ -593,7 +593,7 @@ class job_create(job_create_or_clone):
             if uploading_kernel:
                 default_timeout = socket.getdefaulttimeout()
                 socket.setdefaulttimeout(topic_common.UPLOAD_SOCKET_TIMEOUT)
-                print 'Uploading Kernel: this may take a while...',
+                print('Uploading Kernel: this may take a while...', end=' ')
                 sys.stdout.flush()
             try:
                 cf_info = self.execute_rpc(op='generate_control_file',
@@ -604,7 +604,7 @@ class job_create(job_create_or_clone):
                     socket.setdefaulttimeout(default_timeout)
 
             if uploading_kernel:
-                print 'Done'
+                print('Done')
             self.data['control_file'] = cf_info['control_file']
             if 'synch_count' not in self.data:
                 self.data['synch_count'] = cf_info['synch_count']
@@ -678,16 +678,16 @@ class job_clone(job_create_or_clone):
         # Also remove parameterized_job field, as the feature still is
         # incomplete, this tool does not attempt to support it for now,
         # it uses a different API function and it breaks create_job()
-        if clone_info['job'].has_key('parameterized_job'):
+        if 'parameterized_job' in clone_info['job']:
             del clone_info['job']['parameterized_job']
 
         # Keyword args cannot be unicode strings
         self.data.update((str(key), val)
-                         for key, val in clone_info['job'].iteritems())
+                         for key, val in clone_info['job'].items())
 
         if self.reuse_hosts:
             # Convert host list from clone info that can be used for job_create
-            for label, qty in clone_info['meta_host_counts'].iteritems():
+            for label, qty in clone_info['meta_host_counts'].items():
                 self.data['meta_hosts'].extend([label] * qty)
 
             self.data['hosts'].extend(host['hostname']
@@ -711,7 +711,7 @@ class job_abort(job, action_common.atest_delete):
     def execute(self):
         data = {'job__id__in': self.jobids}
         self.execute_rpc(op='abort_host_queue_entries', **data)
-        print 'Aborting jobs: %s' % ', '.join(self.jobids)
+        print('Aborting jobs: %s' % ', '.join(self.jobids))
 
     # The unittests will hide this method, well, for unittesting
     # pylint: disable=E0202
diff --git a/cli/job_unittest.py b/cli/job_unittest.py
index 4c3277c..483e532 100755
--- a/cli/job_unittest.py
+++ b/cli/job_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2 -u
+#!/usr/bin/python3 -u
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -14,7 +14,7 @@ import os
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock
 # pylint: disable=E0611
 from autotest.cli import job
@@ -29,85 +29,85 @@ class job_unittest(cli_mock.cli_unittest):
         super(job_unittest, self).setUp()
         self.values = copy.deepcopy(self.values_template)
 
-    results = [{u'status_counts': {u'Aborted': 1},
-                u'control_file':
-                u"job.run_test('sleeptest')\n",
-                u'name': u'test_job0',
-                u'control_type': u'Server',
-                u'priority':
-                u'Medium',
-                u'owner': u'user0',
-                u'created_on':
-                u'2008-07-08 17:45:44',
-                u'synch_count': 2,
-                u'id': 180},
-               {u'status_counts': {u'Queued': 1},
-                u'control_file':
-                u"job.run_test('sleeptest')\n",
-                u'name': u'test_job1',
-                u'control_type': u'Client',
-                u'priority':
-                u'High',
-                u'owner': u'user0',
-                u'created_on':
-                u'2008-07-08 12:17:47',
-                u'synch_count': 1,
-                u'id': 338}]
-
-    values_template = [{u'id': 180,          # Valid job
-                        u'priority': u'Low',
-                        u'name': u'test_job0',
-                        u'owner': u'Cringer',
-                        u'invalid': False,
-                        u'created_on': u'2008-07-02 13:02:40',
-                        u'control_type': u'Server',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 2},
-                       {u'id': 338,          # Valid job
-                        u'priority': 'High',
-                        u'name': u'test_job1',
-                        u'owner': u'Fisto',
-                        u'invalid': False,
-                        u'created_on': u'2008-07-06 14:05:33',
-                        u'control_type': u'Client',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 1},
-                       {u'id': 339,          # Valid job
-                        u'priority': 'Medium',
-                        u'name': u'test_job2',
-                        u'owner': u'Roboto',
-                        u'invalid': False,
-                        u'created_on': u'2008-07-07 15:33:18',
-                        u'control_type': u'Server',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 1},
-                       {u'id': 340,          # Invalid job priority
-                        u'priority': u'Uber',
-                        u'name': u'test_job3',
-                        u'owner': u'Panthor',
-                        u'invalid': True,
-                        u'created_on': u'2008-07-04 00:00:01',
-                        u'control_type': u'Server',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 2},
-                       {u'id': 350,          # Invalid job created_on
-                        u'priority': 'Medium',
-                        u'name': u'test_job4',
-                        u'owner': u'Icer',
-                        u'invalid': True,
-                        u'created_on': u'Today',
-                        u'control_type': u'Client',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 1},
-                       {u'id': 420,          # Invalid job control_type
-                        u'priority': 'Urgent',
-                        u'name': u'test_job5',
-                        u'owner': u'Spikor',
-                        u'invalid': True,
-                        u'created_on': u'2012-08-08 18:54:37',
-                        u'control_type': u'Child',
-                        u'status_counts': {u'Queued': 1},
-                        u'synch_count': 2}]
+    results = [{'status_counts': {'Aborted': 1},
+                'control_file':
+                "job.run_test('sleeptest')\n",
+                'name': 'test_job0',
+                'control_type': 'Server',
+                'priority':
+                'Medium',
+                'owner': 'user0',
+                'created_on':
+                '2008-07-08 17:45:44',
+                'synch_count': 2,
+                'id': 180},
+               {'status_counts': {'Queued': 1},
+                'control_file':
+                "job.run_test('sleeptest')\n",
+                'name': 'test_job1',
+                'control_type': 'Client',
+                'priority':
+                'High',
+                'owner': 'user0',
+                'created_on':
+                '2008-07-08 12:17:47',
+                'synch_count': 1,
+                'id': 338}]
+
+    values_template = [{'id': 180,          # Valid job
+                        'priority': 'Low',
+                        'name': 'test_job0',
+                        'owner': 'Cringer',
+                        'invalid': False,
+                        'created_on': '2008-07-02 13:02:40',
+                        'control_type': 'Server',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 2},
+                       {'id': 338,          # Valid job
+                        'priority': 'High',
+                        'name': 'test_job1',
+                        'owner': 'Fisto',
+                        'invalid': False,
+                        'created_on': '2008-07-06 14:05:33',
+                        'control_type': 'Client',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 1},
+                       {'id': 339,          # Valid job
+                        'priority': 'Medium',
+                        'name': 'test_job2',
+                        'owner': 'Roboto',
+                        'invalid': False,
+                        'created_on': '2008-07-07 15:33:18',
+                        'control_type': 'Server',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 1},
+                       {'id': 340,          # Invalid job priority
+                        'priority': 'Uber',
+                        'name': 'test_job3',
+                        'owner': 'Panthor',
+                        'invalid': True,
+                        'created_on': '2008-07-04 00:00:01',
+                        'control_type': 'Server',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 2},
+                       {'id': 350,          # Invalid job created_on
+                        'priority': 'Medium',
+                        'name': 'test_job4',
+                        'owner': 'Icer',
+                        'invalid': True,
+                        'created_on': 'Today',
+                        'control_type': 'Client',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 1},
+                       {'id': 420,          # Invalid job control_type
+                        'priority': 'Urgent',
+                        'name': 'test_job5',
+                        'owner': 'Spikor',
+                        'invalid': True,
+                        'created_on': '2012-08-08 18:54:37',
+                        'control_type': 'Child',
+                        'status_counts': {'Queued': 1},
+                        'synch_count': 2}]
 
 
 class job_list_unittest(job_unittest):
@@ -148,17 +148,17 @@ class job_list_unittest(job_unittest):
                      rpcs=[('get_jobs_summary', {'id__in': ['5964'],
                                                  'running': None},
                             True,
-                            [{u'status_counts': {u'Completed': 1},
-                              u'control_file': u'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
-                              u'name': u'mytest',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-28 12:42:52',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 5964}])],
+                            [{'status_counts': {'Completed': 1},
+                              'control_file': 'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
+                              'name': 'mytest',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-28 12:42:52',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 5964}])],
                      out_words_ok=['user0', 'Completed', '1', '5964'],
                      out_words_no=['sleeptest', 'Priority', 'Client', '2008'])
 
@@ -168,17 +168,17 @@ class job_list_unittest(job_unittest):
                      rpcs=[('get_jobs_summary', {'id__in': ['5964'],
                                                  'running': None},
                             True,
-                            [{u'status_counts': {u'Completed': 1},
-                              u'control_file': u'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
-                              u'name': u'mytest',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-28 12:42:52',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 5964}])],
+                            [{'status_counts': {'Completed': 1},
+                              'control_file': 'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
+                              'name': 'mytest',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-28 12:42:52',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 5964}])],
                      out_words_ok=['user0', 'Completed', '1', '5964',
                                    'Client', '2008', 'Priority'],
                      out_words_no=['sleeptest'])
@@ -189,17 +189,17 @@ class job_list_unittest(job_unittest):
                      rpcs=[('get_jobs_summary', {'name__startswith': 'myt',
                                                  'running': None},
                             True,
-                            [{u'status_counts': {u'Completed': 1},
-                              u'control_file': u'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
-                              u'name': u'mytest',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-28 12:42:52',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 5964}])],
+                            [{'status_counts': {'Completed': 1},
+                              'control_file': 'kernel = \'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\'\ndef step_init():\n    job.next_step([step_test])\n    testkernel = job.kernel(\'8210088647656509311.kernel-smp-2.6.18-220.5.x86_64.rpm\')\n    \n    testkernel.install()\n    testkernel.boot(args=\'console_always_print=1\')\n\ndef step_test():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "Autotest Team"\n    NAME = "Sleeptest"\n    TIME = "SHORT"\n    TEST_CATEGORY = "Functional"\n    TEST_CLASS = "General"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    This test simply sleeps for 1 second by default.  It\'s a good way to test\n    profilers and double check that autotest is working.\n    The seconds argument can also be modified to make the machine sleep for as\n    long as needed.\n    """\n    \n    job.run_test(\'sleeptest\',                             seconds = 1)',
+                              'name': 'mytest',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-28 12:42:52',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 5964}])],
                      out_words_ok=['user0', 'Completed', '1', '5964'],
                      out_words_no=['sleeptest', 'Priority', 'Client', '2008'])
 
@@ -235,27 +235,27 @@ class job_stat_unittest(job_unittest):
                             [results[0]]),
                            ('get_host_queue_entries', {'job__in': ['180']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Repair Failed',
-                                        u'locked': False,
-                                        u'hostname': u'host0',
-                                        u'invalid': True,
-                                        u'id': 4432,
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 180},
-                              u'active': 0,
-                              u'id': 101084}])],
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Repair Failed',
+                                        'locked': False,
+                                        'hostname': 'host0',
+                                        'invalid': True,
+                                        'id': 4432,
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'synchronizing': 0,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 180},
+                              'active': 0,
+                              'id': 101084}])],
                      out_words_ok=['test_job0', 'host0', 'Failed',
                                    'Aborted'])
 
@@ -263,37 +263,37 @@ class job_stat_unittest(job_unittest):
         self.run_cmd(argv=['atest', 'job', 'stat', '6761',
                            '--list-hosts', '--ignore_site_file'],
                      rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
-                            [{u'status_counts': {u'Queued': 1},
-                              u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                              u'name': u'test_on_meta_hosts',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-30 22:15:43',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 6761}]),
+                            [{'status_counts': {'Queued': 1},
+                              'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                              'name': 'test_on_meta_hosts',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-30 22:15:43',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 6761}]),
                            ('get_host_queue_entries', {'job__in': ['6761']},
                             True,
-                            [{u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': u'Xeon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166}])],
+                            [{'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': 'Xeon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166}])],
                      err_words_ok=['unassigned', 'meta-hosts'],
                      out_words_no=['Xeon'])
 
@@ -301,71 +301,71 @@ class job_stat_unittest(job_unittest):
         self.run_cmd(argv=['atest', 'job', 'stat', '6761',
                            '--list-hosts', '--ignore_site_file'],
                      rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
-                            [{u'status_counts': {u'Queued': 1},
-                              u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                              u'name': u'test_on_meta_hosts',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-30 22:15:43',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 6761}]),
+                            [{'status_counts': {'Queued': 1},
+                              'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                              'name': 'test_on_meta_hosts',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-30 22:15:43',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 6761}]),
                            ('get_host_queue_entries', {'job__in': ['6761']},
                             True,
-                            [{u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': {u'status': u'Running',
-                                        u'lock_time': None,
-                                        u'hostname': u'host41',
-                                        u'locked': False,
-                                        u'locked_by': None,
-                                        u'invalid': False,
-                                        u'id': 4833,
-                                        u'protection': u'Repair filesystem only',
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': u'Xeon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166},
-                             {u'status': u'Running',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': {u'status': u'Running',
-                                        u'lock_time': None,
-                                        u'hostname': u'host42',
-                                        u'locked': False,
-                                        u'locked_by': None,
-                                        u'invalid': False,
-                                        u'id': 4833,
-                                        u'protection': u'Repair filesystem only',
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': u'Xeon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166}])],
+                            [{'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': {'status': 'Running',
+                                        'lock_time': None,
+                                        'hostname': 'host41',
+                                        'locked': False,
+                                        'locked_by': None,
+                                        'invalid': False,
+                                        'id': 4833,
+                                        'protection': 'Repair filesystem only',
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': 'Xeon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166},
+                             {'status': 'Running',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': {'status': 'Running',
+                                        'lock_time': None,
+                                        'hostname': 'host42',
+                                        'locked': False,
+                                        'locked_by': None,
+                                        'invalid': False,
+                                        'id': 4833,
+                                        'protection': 'Repair filesystem only',
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': 'Xeon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166}])],
                      out_words_ok=['host41', 'host42'],
                      out_words_no=['Xeon', 'Running', 'Queued'],
                      err_words_no=['unassigned'])
@@ -375,71 +375,71 @@ class job_stat_unittest(job_unittest):
                            '--list-hosts-status', 'Running,Queued',
                            '--ignore_site_file'],
                      rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
-                            [{u'status_counts': {u'Queued': 1, u'Running': 1},
-                              u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                              u'name': u'test',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-30 22:15:43',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 6761}]),
+                            [{'status_counts': {'Queued': 1, 'Running': 1},
+                              'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                              'name': 'test',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-30 22:15:43',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 6761}]),
                            ('get_host_queue_entries', {'job__in': ['6761']},
                             True,
-                            [{u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': {u'status': u'Queued',
-                                        u'lock_time': None,
-                                        u'hostname': u'host41',
-                                        u'locked': False,
-                                        u'locked_by': None,
-                                        u'invalid': False,
-                                        u'id': 4833,
-                                        u'protection': u'Repair filesystem only',
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166},
-                             {u'status': u'Running',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': {u'status': u'Running',
-                                        u'lock_time': None,
-                                        u'hostname': u'host42',
-                                        u'locked': False,
-                                        u'locked_by': None,
-                                        u'invalid': False,
-                                        u'id': 4833,
-                                        u'protection': u'Repair filesystem only',
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166}])],
+                            [{'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': {'status': 'Queued',
+                                        'lock_time': None,
+                                        'hostname': 'host41',
+                                        'locked': False,
+                                        'locked_by': None,
+                                        'invalid': False,
+                                        'id': 4833,
+                                        'protection': 'Repair filesystem only',
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166},
+                             {'status': 'Running',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': {'status': 'Running',
+                                        'lock_time': None,
+                                        'hostname': 'host42',
+                                        'locked': False,
+                                        'locked_by': None,
+                                        'invalid': False,
+                                        'id': 4833,
+                                        'protection': 'Repair filesystem only',
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166}])],
                      out_words_ok=['Queued', 'Running', 'host41', 'host42'],
                      out_words_no=['Xeon'],
                      err_words_no=['unassigned'])
@@ -448,118 +448,118 @@ class job_stat_unittest(job_unittest):
         self.run_cmd(argv=['atest', 'job', 'stat', '6761',
                            '--ignore_site_file'],
                      rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
-                            [{u'status_counts': {u'Running': 1,
-                                                 u'Queued': 4},
-                              u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                              u'name': u'test_on_meta_hosts',
-                              u'control_type': u'Client',
-                              u'run_verify': 1,
-                              u'priority': u'Medium',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-30 22:15:43',
-                              u'timeout': 144,
-                              u'synch_count': 1,
-                              u'id': 6761}]),
+                            [{'status_counts': {'Running': 1,
+                                                 'Queued': 4},
+                              'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                              'name': 'test_on_meta_hosts',
+                              'control_type': 'Client',
+                              'run_verify': 1,
+                              'priority': 'Medium',
+                              'owner': 'user0',
+                              'created_on': '2008-07-30 22:15:43',
+                              'timeout': 144,
+                              'synch_count': 1,
+                              'id': 6761}]),
                            ('get_host_queue_entries', {'job__in': ['6761']},
                             True,
-                            [{u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': u'Xeon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193166},
-                             {u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': u'Xeon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193167},
-                             {u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': u'Athlon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193168},
-                             {u'status': u'Queued',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': u'x286',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 0,
-                              u'id': 193169},
-                             {u'status': u'Running',
-                              u'complete': 0,
-                              u'deleted': 0,
-                              u'host': {u'status': u'Running',
-                                        u'lock_time': None,
-                                        u'hostname': u'host42',
-                                        u'locked': False,
-                                        u'locked_by': None,
-                                        u'invalid': False,
-                                        u'id': 4833,
-                                        u'protection': u'Repair filesystem only',
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': u'Athlon',
-                              u'job': {u'control_file': u'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
-                                       u'name': u'test_on_meta_hosts',
-                                       u'control_type': u'Client',
-                                       u'run_verify': 1,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-07-30 22:15:43',
-                                       u'timeout': 144,
-                                       u'synch_count': 1,
-                                       u'id': 6761},
-                              u'active': 1,
-                              u'id': 193170}])],
+                            [{'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': 'Xeon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193166},
+                             {'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': 'Xeon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193167},
+                             {'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': 'Athlon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193168},
+                             {'status': 'Queued',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': 'x286',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 0,
+                              'id': 193169},
+                             {'status': 'Running',
+                              'complete': 0,
+                              'deleted': 0,
+                              'host': {'status': 'Running',
+                                        'lock_time': None,
+                                        'hostname': 'host42',
+                                        'locked': False,
+                                        'locked_by': None,
+                                        'invalid': False,
+                                        'id': 4833,
+                                        'protection': 'Repair filesystem only',
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': 'Athlon',
+                              'job': {'control_file': 'def step_init():\n    job.next_step(\'step0\')\n\ndef step0():\n    AUTHOR = "[e-mail] (Martin Bligh)"\n    NAME = "Kernbench"\n    TIME = "SHORT"\n    TEST_CLASS = "Kernel"\n    TEST_CATEGORY = "Benchmark"\n    TEST_TYPE = "client"\n    \n    DOC = """\n    A standard CPU benchmark. Runs a kernel compile and measures the performance.\n    """\n    \n    job.run_test(\'kernbench\')',
+                                       'name': 'test_on_meta_hosts',
+                                       'control_type': 'Client',
+                                       'run_verify': 1,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-07-30 22:15:43',
+                                       'timeout': 144,
+                                       'synch_count': 1,
+                                       'id': 6761},
+                              'active': 1,
+                              'id': 193170}])],
                      out_words_ok=['test_on_meta_hosts',
                                    'host42', 'Queued', 'Running'],
                      out_words_no=['Athlon', 'Xeon', 'x286'])
@@ -572,21 +572,21 @@ class job_stat_unittest(job_unittest):
                             [results[0]]),
                            ('get_host_queue_entries', {'job__in': ['180']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': None,
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 180},
-                              u'active': 0,
-                              u'id': 101084}])],
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': None,
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 180},
+                              'active': 0,
+                              'id': 101084}])],
                      err_words_ok=['unassigned', 'meta-hosts'])
 
     def test_job_stat_multi_jobs(self):
@@ -598,46 +598,46 @@ class job_stat_unittest(job_unittest):
                            ('get_host_queue_entries',
                             {'job__in': ['180', '338']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Repair Failed',
-                                        u'locked': False,
-                                        u'hostname': u'host0',
-                                        u'invalid': True,
-                                        u'id': 4432,
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 180},
-                              u'active': 0,
-                              u'id': 101084},
-                             {u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Repair Failed',
-                                        u'locked': False,
-                                        u'hostname': u'host10',
-                                        u'invalid': True,
-                                        u'id': 4432,
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 338},
-                              u'active': 0,
-                              u'id': 101084}])],
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Repair Failed',
+                                        'locked': False,
+                                        'hostname': 'host0',
+                                        'invalid': True,
+                                        'id': 4432,
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 180},
+                              'active': 0,
+                              'id': 101084},
+                             {'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Repair Failed',
+                                        'locked': False,
+                                        'hostname': 'host10',
+                                        'invalid': True,
+                                        'id': 4432,
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 338},
+                              'active': 0,
+                              'id': 101084}])],
                      out_words_ok=['test_job0', 'test_job1'])
 
     def test_job_stat_multi_jobs_name_id(self):
@@ -645,79 +645,79 @@ class job_stat_unittest(job_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_jobs_summary', {'id__in': ['180']},
                             True,
-                            [{u'status_counts': {u'Aborted': 1},
-                              u'control_file':
-                              u"job.run_test('sleeptest')\n",
-                              u'name': u'job0',
-                              u'control_type': u'Server',
-                              u'priority':
-                              u'Medium',
-                              u'owner': u'user0',
-                              u'created_on':
-                              u'2008-07-08 17:45:44',
-                              u'synch_count': 2,
-                              u'id': 180}]),
+                            [{'status_counts': {'Aborted': 1},
+                              'control_file':
+                              "job.run_test('sleeptest')\n",
+                              'name': 'job0',
+                              'control_type': 'Server',
+                              'priority':
+                              'Medium',
+                              'owner': 'user0',
+                              'created_on':
+                              '2008-07-08 17:45:44',
+                              'synch_count': 2,
+                              'id': 180}]),
                            ('get_jobs_summary', {'name__in': ['mytest']},
                             True,
-                            [{u'status_counts': {u'Queued': 1},
-                              u'control_file':
-                              u"job.run_test('sleeptest')\n",
-                              u'name': u'mytest',
-                              u'control_type': u'Client',
-                              u'priority':
-                              u'High',
-                              u'owner': u'user0',
-                              u'created_on': u'2008-07-08 12:17:47',
-                              u'synch_count': 1,
-                              u'id': 338}]),
+                            [{'status_counts': {'Queued': 1},
+                              'control_file':
+                              "job.run_test('sleeptest')\n",
+                              'name': 'mytest',
+                              'control_type': 'Client',
+                              'priority':
+                              'High',
+                              'owner': 'user0',
+                              'created_on': '2008-07-08 12:17:47',
+                              'synch_count': 1,
+                              'id': 338}]),
                            ('get_host_queue_entries',
                             {'job__in': ['180']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Repair Failed',
-                                        u'locked': False,
-                                        u'hostname': u'host0',
-                                        u'invalid': True,
-                                        u'id': 4432,
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 180},
-                              u'active': 0,
-                              u'id': 101084}]),
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Repair Failed',
+                                        'locked': False,
+                                        'hostname': 'host0',
+                                        'invalid': True,
+                                        'id': 4432,
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'synchronizing': 0,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 180},
+                              'active': 0,
+                              'id': 101084}]),
                            ('get_host_queue_entries',
                             {'job__name__in': ['mytest']},
                             True,
-                            [{u'status': u'Failed',
-                              u'complete': 1,
-                              u'host': {u'status': u'Repair Failed',
-                                        u'locked': False,
-                                        u'hostname': u'host10',
-                                        u'invalid': True,
-                                        u'id': 4432,
-                                        u'synch_id': None},
-                              u'priority': 1,
-                              u'meta_host': None,
-                              u'job': {u'control_file': u"def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
-                                       u'name': u'test_sleep',
-                                       u'control_type': u'Server',
-                                       u'synchronizing': 0,
-                                       u'priority': u'Medium',
-                                       u'owner': u'user0',
-                                       u'created_on': u'2008-03-18 11:27:29',
-                                       u'synch_count': 1,
-                                       u'id': 338},
-                              u'active': 0,
-                              u'id': 101084}])],
+                            [{'status': 'Failed',
+                              'complete': 1,
+                              'host': {'status': 'Repair Failed',
+                                        'locked': False,
+                                        'hostname': 'host10',
+                                        'invalid': True,
+                                        'id': 4432,
+                                        'synch_id': None},
+                              'priority': 1,
+                              'meta_host': None,
+                              'job': {'control_file': "def run(machine):\n\thost = hosts.create_host(machine)\n\tat = autotest_remote.Autotest(host)\n\tat.run_test('sleeptest')\n\nparallel_simple(run, machines)",
+                                       'name': 'test_sleep',
+                                       'control_type': 'Server',
+                                       'synchronizing': 0,
+                                       'priority': 'Medium',
+                                       'owner': 'user0',
+                                       'created_on': '2008-03-18 11:27:29',
+                                       'synch_count': 1,
+                                       'id': 338},
+                              'active': 0,
+                              'id': 101084}])],
                      out_words_ok=['job0', 'mytest', 'Aborted', 'Queued',
                                    'Failed', 'Medium', 'High'])
 
@@ -1187,20 +1187,20 @@ class job_create_unittest(cli_mock.cli_unittest):
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'multiple_labels': ['label1',
                                                               'label2']}, True,
-                            [{u'status': u'Running', u'lock_time': None,
-                              u'hostname': u'host1', u'locked': False,
-                              u'locked_by': None, u'invalid': False, u'id': 42,
-                              u'labels': [u'label1'], u'platform':
-                              u'Warp18_Diskfull', u'protection':
-                              u'Repair software only', u'dirty':
-                              True, u'synch_id': None},
-                             {u'status': u'Running', u'lock_time': None,
-                              u'hostname': u'host2', u'locked': False,
-                              u'locked_by': None, u'invalid': False, u'id': 43,
-                              u'labels': [u'label2'], u'platform':
-                              u'Warp18_Diskfull', u'protection':
-                              u'Repair software only', u'dirty': True,
-                              u'synch_id': None}]),
+                            [{'status': 'Running', 'lock_time': None,
+                              'hostname': 'host1', 'locked': False,
+                              'locked_by': None, 'invalid': False, 'id': 42,
+                              'labels': ['label1'], 'platform':
+                              'Warp18_Diskfull', 'protection':
+                              'Repair software only', 'dirty':
+                              True, 'synch_id': None},
+                             {'status': 'Running', 'lock_time': None,
+                              'hostname': 'host2', 'locked': False,
+                              'locked_by': None, 'invalid': False, 'id': 43,
+                              'labels': ['label2'], 'platform':
+                              'Warp18_Diskfull', 'protection':
+                              'Repair software only', 'dirty': True,
+                              'synch_id': None}]),
                            ('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
@@ -1214,13 +1214,13 @@ class job_create_unittest(cli_mock.cli_unittest):
                            'test_job0', '-m', 'host0,host1', '-b', 'label1',
                            '--ignore_site_file'],
                      rpcs=[('get_hosts', {'multiple_labels': ['label1']}, True,
-                            [{u'status': u'Running', u'lock_time': None,
-                              u'hostname': u'host1', u'locked': False,
-                              u'locked_by': None, u'invalid': False, u'id': 42,
-                              u'labels': [u'label1'], u'platform':
-                              u'Warp18_Diskfull', u'protection':
-                              u'Repair software only', u'dirty':
-                              True, u'synch_id': None}]),
+                            [{'status': 'Running', 'lock_time': None,
+                              'hostname': 'host1', 'locked': False,
+                              'locked_by': None, 'invalid': False, 'id': 42,
+                              'labels': ['label1'], 'platform':
+                              'Warp18_Diskfull', 'protection':
+                              'Repair software only', 'dirty':
+                              True, 'synch_id': None}]),
                            ('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
@@ -1235,13 +1235,13 @@ class job_create_unittest(cli_mock.cli_unittest):
                            'label1,label\\,2', '--ignore_site_file'],
                      rpcs=[('get_hosts', {'multiple_labels': ['label1',
                                                               'label,2']}, True,
-                            [{u'status': u'Running', u'lock_time': None,
-                              u'hostname': u'host1', u'locked': False,
-                              u'locked_by': None, u'invalid': False, u'id': 42,
-                              u'labels': [u'label1', u'label,2'], u'platform':
-                              u'Warp18_Diskfull', u'protection':
-                              u'Repair software only', u'dirty':
-                              True, u'synch_id': None}]),
+                            [{'status': 'Running', 'lock_time': None,
+                              'hostname': 'host1', 'locked': False,
+                              'locked_by': None, 'invalid': False, 'id': 42,
+                              'labels': ['label1', 'label,2'], 'platform':
+                              'Warp18_Diskfull', 'protection':
+                              'Repair software only', 'dirty':
+                              True, 'synch_id': None}]),
                            ('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
@@ -1256,13 +1256,13 @@ class job_create_unittest(cli_mock.cli_unittest):
                            'label1,label\\,2\\\\,label3', '--ignore_site_file'],
                      rpcs=[('get_hosts', {'multiple_labels': ['label,2\\',
                                                               'label1', 'label3']}, True,
-                            [{u'status': u'Running', u'lock_time': None,
-                              u'hostname': u'host1', u'locked': False,
-                              u'locked_by': None, u'invalid': False, u'id': 42,
-                              u'labels': [u'label1', u'label,2\\', u'label3'],
-                              u'platform': u'Warp18_Diskfull', u'protection':
-                              u'Repair software only', u'dirty':
-                              True, u'synch_id': None}]),
+                            [{'status': 'Running', 'lock_time': None,
+                              'hostname': 'host1', 'locked': False,
+                              'locked_by': None, 'invalid': False, 'id': 42,
+                              'labels': ['label1', 'label,2\\', 'label3'],
+                              'platform': 'Warp18_Diskfull', 'protection':
+                              'Repair software only', 'dirty':
+                              True, 'synch_id': None}]),
                            ('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
@@ -1296,16 +1296,16 @@ class job_create_unittest(cli_mock.cli_unittest):
                                ['meta0'] * 5 + ['meta1'] * 2 + ['meta2'])
 
     def test_parse_hosts_metas_labels_wildcards(self):
-        values = [{u'id': 180,
-                   u'platform': False,
-                   u'name': u'label0',
-                   u'invalid': False,
-                   u'kernel_config': u''},
-                  {u'id': 338,
-                   u'platform': False,
-                   u'name': u'label1',
-                   u'invalid': False,
-                   u'kernel_config': u''}]
+        values = [{'id': 180,
+                   'platform': False,
+                   'name': 'label0',
+                   'invalid': False,
+                   'kernel_config': ''},
+                  {'id': 338,
+                   'platform': False,
+                   'name': 'label1',
+                   'invalid': False,
+                   'kernel_config': ''}]
         testjob = job.job_create_or_clone()
         testjob.afe = rpc.afe_comm()
         self.mock_rpcs([('get_labels', {'name__startswith': 'label'},
@@ -1366,51 +1366,51 @@ class job_create_unittest(cli_mock.cli_unittest):
 
 
 class job_clone_unittest(cli_mock.cli_unittest):
-    job_data = {'control_file': u'NAME = \'Server Sleeptest\'\nAUTHOR = \'[e-mail] (Martin Bligh)\'\nTIME = \'SHORT\'\nTEST_CLASS = \'Software\'\nTEST_CATEGORY = \'Functional\'\nTEST_TYPE = \'server\'\nEXPERIMENTAL = \'False\'\n\nDOC = """\nruns sleep for one second on the list of machines.\n"""\n\ndef run(machine):\n    host = hosts.create_host(machine)\n    job.run_test(\'sleeptest\')\n\njob.parallel_simple(run, machines)\n',
-                'control_type': u'Server',
+    job_data = {'control_file': 'NAME = \'Server Sleeptest\'\nAUTHOR = \'[e-mail] (Martin Bligh)\'\nTIME = \'SHORT\'\nTEST_CLASS = \'Software\'\nTEST_CATEGORY = \'Functional\'\nTEST_TYPE = \'server\'\nEXPERIMENTAL = \'False\'\n\nDOC = """\nruns sleep for one second on the list of machines.\n"""\n\ndef run(machine):\n    host = hosts.create_host(machine)\n    job.run_test(\'sleeptest\')\n\njob.parallel_simple(run, machines)\n',
+                'control_type': 'Server',
                 'dependencies': [],
-                'email_list': u'',
+                'email_list': '',
                 'max_runtime_hrs': 480,
                 'parse_failed_repair': True,
-                'priority': u'Medium',
-                'reboot_after': u'Always',
-                'reboot_before': u'If dirty',
+                'priority': 'Medium',
+                'reboot_after': 'Always',
+                'reboot_before': 'If dirty',
                 'run_verify': True,
                 'synch_count': 1,
                 'timeout': 480}
 
-    local_hosts = [{u'acls': [u'acl0'],
-                    u'atomic_group': None,
-                    u'attributes': {},
-                    u'dirty': False,
-                    u'hostname': u'host0',
-                    u'id': 8,
-                    u'invalid': False,
-                    u'labels': [u'label0', u'label1'],
-                    u'lock_time': None,
-                    u'locked': False,
-                    u'locked_by': None,
-                    u'other_labels': u'label0, label1',
-                    u'platform': u'plat0',
-                    u'protection': u'Repair software only',
-                    u'status': u'Ready',
-                    u'synch_id': None},
-                   {u'acls': [u'acl0'],
-                    u'atomic_group': None,
-                    u'attributes': {},
-                    u'dirty': False,
-                    u'hostname': u'host1',
-                    u'id': 9,
-                    u'invalid': False,
-                    u'labels': [u'label0', u'label1'],
-                    u'lock_time': None,
-                    u'locked': False,
-                    u'locked_by': None,
-                    u'other_labels': u'label0, label1',
-                    u'platform': u'plat0',
-                    u'protection': u'Repair software only',
-                    u'status': u'Ready',
-                    u'synch_id': None}]
+    local_hosts = [{'acls': ['acl0'],
+                    'atomic_group': None,
+                    'attributes': {},
+                    'dirty': False,
+                    'hostname': 'host0',
+                    'id': 8,
+                    'invalid': False,
+                    'labels': ['label0', 'label1'],
+                    'lock_time': None,
+                    'locked': False,
+                    'locked_by': None,
+                    'other_labels': 'label0, label1',
+                    'platform': 'plat0',
+                    'protection': 'Repair software only',
+                    'status': 'Ready',
+                    'synch_id': None},
+                   {'acls': ['acl0'],
+                    'atomic_group': None,
+                    'attributes': {},
+                    'dirty': False,
+                    'hostname': 'host1',
+                    'id': 9,
+                    'invalid': False,
+                    'labels': ['label0', 'label1'],
+                    'lock_time': None,
+                    'locked': False,
+                    'locked_by': None,
+                    'other_labels': 'label0, label1',
+                    'platform': 'plat0',
+                    'protection': 'Repair software only',
+                    'status': 'Ready',
+                    'synch_id': None}]
 
     def setUp(self):
         super(job_clone_unittest, self).setUp()
@@ -1422,7 +1422,7 @@ class job_clone_unittest(cli_mock.cli_unittest):
 
         self.job_data_cloned = copy.deepcopy(self.job_data)
         self.job_data_cloned['name'] = 'cloned'
-        self.job_data_cloned['hosts'] = [u'host0']
+        self.job_data_cloned['hosts'] = ['host0']
         self.job_data_cloned['meta_hosts'] = []
 
     def test_backward_compat(self):
@@ -1431,39 +1431,39 @@ class job_clone_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': True},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': [{u'acls': [u'acl0'],
-                                         u'atomic_group': None,
-                                         u'attributes': {},
-                                         u'dirty': False,
-                                         u'hostname': u'host0',
-                                         u'id': 4378,
-                                         u'invalid': False,
-                                         u'labels': [u'label0', u'label1'],
-                                         u'lock_time': None,
-                                         u'locked': False,
-                                         u'locked_by': None,
-                                         u'other_labels': u'label0, label1',
-                                         u'platform': u'plat0',
-                                         u'protection': u'Repair software only',
-                                         u'status': u'Ready',
-                                         u'synch_id': None}],
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {}}),
+                            {'atomic_group_name': None,
+                             'hosts': [{'acls': ['acl0'],
+                                         'atomic_group': None,
+                                         'attributes': {},
+                                         'dirty': False,
+                                         'hostname': 'host0',
+                                         'id': 4378,
+                                         'invalid': False,
+                                         'labels': ['label0', 'label1'],
+                                         'lock_time': None,
+                                         'locked': False,
+                                         'locked_by': None,
+                                         'other_labels': 'label0, label1',
+                                         'platform': 'plat0',
+                                         'protection': 'Repair software only',
+                                         'status': 'Ready',
+                                         'synch_id': None}],
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
     def test_clone_reuse_hosts(self):
-        self.job_data_cloned['hosts'] = [u'host0', 'host1']
+        self.job_data_cloned['hosts'] = ['host0', 'host1']
         self.run_cmd(argv=['atest', 'job', 'clone', '--id', '42',
                            '-r', 'cloned'],
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': True},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': self.local_hosts,
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {}}),
+                            {'atomic_group_name': None,
+                             'hosts': self.local_hosts,
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
@@ -1475,27 +1475,27 @@ class job_clone_unittest(cli_mock.cli_unittest):
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': True},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': [],
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {u'type0': 1,
-                                                   u'type1': 4}}),
+                            {'atomic_group_name': None,
+                             'hosts': [],
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {'type0': 1,
+                                                   'type1': 4}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
     def test_clone_reuse_both(self):
-        self.job_data_cloned['hosts'] = [u'host0', 'host1']
+        self.job_data_cloned['hosts'] = ['host0', 'host1']
         self.job_data_cloned['meta_hosts'] = ['type1'] * 4 + ['type0']
         self.run_cmd(argv=['atest', 'job', 'clone', '--id', '42',
                            '-r', 'cloned'],
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': True},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': self.local_hosts,
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {u'type0': 1,
-                                                   u'type1': 4}}),
+                            {'atomic_group_name': None,
+                             'hosts': self.local_hosts,
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {'type0': 1,
+                                                   'type1': 4}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
@@ -1513,41 +1513,41 @@ class job_clone_unittest(cli_mock.cli_unittest):
                      err_words_ok=['specify'])
 
     def test_clone_new_multiple_hosts(self):
-        self.job_data_cloned['hosts'] = [u'host5', 'host4', 'host3']
+        self.job_data_cloned['hosts'] = ['host5', 'host4', 'host3']
         self.run_cmd(argv=['atest', 'job', 'clone', '--id', '42',
                            '-m', 'host5,host4,host3', 'cloned'],
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': False},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': self.local_hosts,
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {}}),
+                            {'atomic_group_name': None,
+                             'hosts': self.local_hosts,
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
     def test_clone_oth(self):
         self.job_data_cloned['hosts'] = []
-        self.job_data_cloned['one_time_hosts'] = [u'host5']
+        self.job_data_cloned['one_time_hosts'] = ['host5']
         self.run_cmd(argv=['atest', 'job', 'clone', '--id', '42',
                            '--one-time-hosts', 'host5', 'cloned'],
                      rpcs=[('get_info_for_clone', {'id': '42',
                                                    'preserve_metahosts': False},
                             True,
-                            {u'atomic_group_name': None,
-                             u'hosts': self.local_hosts,
-                             u'job': self.job_data_clone_info,
-                             u'meta_host_counts': {}}),
+                            {'atomic_group_name': None,
+                             'hosts': self.local_hosts,
+                             'job': self.job_data_clone_info,
+                             'meta_host_counts': {}}),
                            ('create_job', self.job_data_cloned, True, 43)],
                      out_words_ok=['Created job', '43'])
 
 
 class job_abort_unittest(cli_mock.cli_unittest):
-    results = [{u'status_counts': {u'Aborted': 1}, u'control_file':
-                u"job.run_test('sleeptest')\n", u'name': u'test_job0',
-                u'control_type': u'Server', u'priority':
-                u'Medium', u'owner': u'user0', u'created_on':
-                u'2008-07-08 17:45:44', u'synch_count': 2, u'id': 180}]
+    results = [{'status_counts': {'Aborted': 1}, 'control_file':
+                "job.run_test('sleeptest')\n", 'name': 'test_job0',
+                'control_type': 'Server', 'priority':
+                'Medium', 'owner': 'user0', 'created_on':
+                '2008-07-08 17:45:44', 'synch_count': 2, 'id': 180}]
 
     def test_execute_job_abort(self):
         self.run_cmd(argv=['atest', 'job', 'abort', '180',
diff --git a/cli/label_unittest.py b/cli/label_unittest.py
index b24c9a3..fc079f1 100755
--- a/cli/label_unittest.py
+++ b/cli/label_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -11,41 +11,41 @@ import os
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, topic_common
 
 
 class label_list_unittest(cli_mock.cli_unittest):
-    values = [{u'id': 180,          # Valid label
-               u'platform': False,
-               u'name': u'label0',
-               u'invalid': False,
-               u'kernel_config': u'',
-               u'only_if_needed': False},
-              {u'id': 338,          # Valid label
-               u'platform': False,
-               u'name': u'label1',
-               u'invalid': False,
-               u'kernel_config': u'',
-               u'only_if_needed': False},
-              {u'id': 340,          # Invalid label
-               u'platform': False,
-               u'name': u'label2',
-               u'invalid': True,
-               u'kernel_config': u'',
-               u'only_if_needed': False},
-              {u'id': 350,          # Valid platform
-               u'platform': True,
-               u'name': u'plat0',
-               u'invalid': False,
-               u'kernel_config': u'',
-               u'only_if_needed': False},
-              {u'id': 420,          # Invalid platform
-               u'platform': True,
-               u'name': u'plat1',
-               u'invalid': True,
-               u'kernel_config': u'',
-               u'only_if_needed': False}]
+    values = [{'id': 180,          # Valid label
+               'platform': False,
+               'name': 'label0',
+               'invalid': False,
+               'kernel_config': '',
+               'only_if_needed': False},
+              {'id': 338,          # Valid label
+               'platform': False,
+               'name': 'label1',
+               'invalid': False,
+               'kernel_config': '',
+               'only_if_needed': False},
+              {'id': 340,          # Invalid label
+               'platform': False,
+               'name': 'label2',
+               'invalid': True,
+               'kernel_config': '',
+               'only_if_needed': False},
+              {'id': 350,          # Valid platform
+               'platform': True,
+               'name': 'plat0',
+               'invalid': False,
+               'kernel_config': '',
+               'only_if_needed': False},
+              {'id': 420,          # Invalid platform
+               'platform': True,
+               'name': 'plat1',
+               'invalid': True,
+               'kernel_config': '',
+               'only_if_needed': False}]
 
     def test_label_list_labels_only(self):
         self.run_cmd(argv=['atest', 'label', 'list', '--ignore_site_file'],
diff --git a/cli/rpc.py b/cli/rpc.py
index affb768..f843d86 100644
--- a/cli/rpc.py
+++ b/cli/rpc.py
@@ -41,7 +41,7 @@ class rpc_comm(object):
         self.web_server = get_autotest_server(web_server)
         try:
             self.proxy = self._connect(rpc_path)
-        except rpc_client_lib.AuthError, s:
+        except rpc_client_lib.AuthError as s:
             raise AuthError(s)
 
     def _connect(self, rpc_path):
@@ -54,11 +54,11 @@ class rpc_comm(object):
 
     def run(self, op, *args, **data):
         if 'AUTOTEST_CLI_DEBUG' in os.environ:
-            print self.web_server, op, args, data
+            print(self.web_server, op, args, data)
         function = getattr(self.proxy, op)
         result = function(*args, **data)
         if 'AUTOTEST_CLI_DEBUG' in os.environ:
-            print 'result:', result
+            print('result:', result)
         return result
 
 
diff --git a/cli/rpc_unittest.py b/cli/rpc_unittest.py
index 2b4ee5a..2e7fe99 100755
--- a/cli/rpc_unittest.py
+++ b/cli/rpc_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -9,7 +9,7 @@ import os
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import rpc
 from autotest.client.shared.settings import settings
 
diff --git a/cli/setup.py b/cli/setup.py
index d28b420..3ae8fba 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -5,7 +5,7 @@ import os
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 
 from autotest.client.shared import version
 
diff --git a/cli/test_unittest.py b/cli/test_unittest.py
index e6d0392..c3b6da9 100755
--- a/cli/test_unittest.py
+++ b/cli/test_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -11,51 +11,51 @@ import os
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, topic_common, test
 
 
 class test_list_unittest(cli_mock.cli_unittest):
-    values = [{u'description': u'unknown',
-               u'test_type': u'Client',
-               u'test_class': u'Canned Test Sets',
-               u'path': u'client/tests/test0/control',
-               u'synch_type': u'Asynchronous',
-               u'id': 138,
-               u'name': u'test0',
-               u'experimental': False},
-              {u'description': u'unknown',
-               u'test_type': u'Server',
-               u'test_class': u'Kernel',
-               u'path': u'server/tests/test1/control',
-               u'synch_type': u'Asynchronous',
-               u'id': 139,
-               u'name': u'test1',
-               u'experimental': False},
-              {u'description': u'unknown',
-               u'test_type': u'Client',
-               u'test_class': u'Canned Test Sets',
-               u'path': u'client/tests/test2/control.readprofile',
-               u'synch_type': u'Asynchronous',
-               u'id': 140,
-               u'name': u'test2',
-               u'experimental': False},
-              {u'description': u'unknown',
-               u'test_type': u'Server',
-               u'test_class': u'Canned Test Sets',
-               u'path': u'server/tests/test3/control',
-               u'synch_type': u'Asynchronous',
-               u'id': 142,
-               u'name': u'test3',
-               u'experimental': False},
-              {u'description': u'Random stuff to check that things are ok',
-               u'test_type': u'Client',
-               u'test_class': u'Hardware',
-               u'path': u'client/tests/test4/control.export',
-               u'synch_type': u'Asynchronous',
-               u'id': 143,
-               u'name': u'test4',
-               u'experimental': True}]
+    values = [{'description': 'unknown',
+               'test_type': 'Client',
+               'test_class': 'Canned Test Sets',
+               'path': 'client/tests/test0/control',
+               'synch_type': 'Asynchronous',
+               'id': 138,
+               'name': 'test0',
+               'experimental': False},
+              {'description': 'unknown',
+               'test_type': 'Server',
+               'test_class': 'Kernel',
+               'path': 'server/tests/test1/control',
+               'synch_type': 'Asynchronous',
+               'id': 139,
+               'name': 'test1',
+               'experimental': False},
+              {'description': 'unknown',
+               'test_type': 'Client',
+               'test_class': 'Canned Test Sets',
+               'path': 'client/tests/test2/control.readprofile',
+               'synch_type': 'Asynchronous',
+               'id': 140,
+               'name': 'test2',
+               'experimental': False},
+              {'description': 'unknown',
+               'test_type': 'Server',
+               'test_class': 'Canned Test Sets',
+               'path': 'server/tests/test3/control',
+               'synch_type': 'Asynchronous',
+               'id': 142,
+               'name': 'test3',
+               'experimental': False},
+              {'description': 'Random stuff to check that things are ok',
+               'test_type': 'Client',
+               'test_class': 'Hardware',
+               'path': 'client/tests/test4/control.export',
+               'synch_type': 'Asynchronous',
+               'id': 143,
+               'name': 'test4',
+               'experimental': True}]
 
     def test_test_list_tests_default(self):
         self.run_cmd(argv=['atest', 'test', 'list'],
@@ -77,14 +77,14 @@ class test_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'test', 'list', '--experimental'],
                      rpcs=[('get_tests', {'experimental': True},
                             True,
-                            [{u'description': u'Random stuff',
-                              u'test_type': u'Client',
-                              u'test_class': u'Hardware',
-                              u'path': u'client/tests/test4/control.export',
-                              u'synch_type': u'Asynchronous',
-                              u'id': 143,
-                              u'name': u'test4',
-                              u'experimental': True}])],
+                            [{'description': 'Random stuff',
+                              'test_type': 'Client',
+                              'test_class': 'Hardware',
+                              'path': 'client/tests/test4/control.export',
+                              'synch_type': 'Asynchronous',
+                              'id': 143,
+                              'name': 'test4',
+                              'experimental': True}])],
                      out_words_ok=['test4'],
                      out_words_no=['Random', 'control.export'])
 
diff --git a/cli/threads.py b/cli/threads.py
index 47fb295..374c052 100644
--- a/cli/threads.py
+++ b/cli/threads.py
@@ -3,7 +3,7 @@
 # Released under the GPLv2
 
 import threading
-import Queue
+import queue
 
 
 class ThreadPool:
@@ -15,16 +15,16 @@ class ThreadPool:
 
     def __init__(self, function, numthreads=40):
         assert(numthreads > 0)
-        self.threads = Queue.Queue(0)
+        self.threads = queue.Queue(0)
         self.function = function
         self.numthreads = 0
-        self.queue = Queue.Queue(0)
+        self.queue = queue.Queue(0)
         self._start_threads(numthreads)
 
     def wait(self):
         """ Checks to see if any threads are still working and
             blocks until worker threads all complete. """
-        for x in xrange(self.numthreads):
+        for x in range(self.numthreads):
             self.queue.put('die')
         # As only spawned threads are allowed to add new ones,
         # we can safely wait for the thread queue to be empty
@@ -37,7 +37,7 @@ class ThreadPool:
                 if thread.isAlive():
                     thread.join()
                 dead += 1
-            except Queue.Empty:
+            except queue.Empty:
                 assert(dead == self.numthreads)
                 return
 
@@ -55,7 +55,7 @@ class ThreadPool:
     def _start_threads(self, nthreads):
         """ Start up threads to spawn workers. """
         self.numthreads += nthreads
-        for i in xrange(nthreads):
+        for i in range(nthreads):
             thread = threading.Thread(target=self._new_worker)
             thread.setDaemon(True)
             self.threads.put(thread)
@@ -70,7 +70,7 @@ class ThreadPool:
                 return
             try:
                 self.function(data)
-            except Exception, full_error:
+            except Exception as full_error:
                 # Put a catch all here.
-                print ('Unexpected failure in the thread calling %s: %s' %
-                       (self.function.__name__, full_error))
+                print(('Unexpected failure in the thread calling %s: %s' %
+                       (self.function.__name__, full_error)))
diff --git a/cli/threads_unittest.py b/cli/threads_unittest.py
index a692a22..e1336ca 100755
--- a/cli/threads_unittest.py
+++ b/cli/threads_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -9,17 +9,17 @@ import sys
 import os
 
 import threading
-import Queue
+import queue
 
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, threads
 
 
 class thread_unittest(cli_mock.cli_unittest):
-    results = Queue.Queue()
+    results = queue.Queue()
 
     def _workload(self, i):
         self.results.put(i * i)
@@ -36,7 +36,7 @@ class thread_unittest(cli_mock.cli_unittest):
 
     def test_one_thread(self):
         th = threads.ThreadPool(self._workload, numthreads=1)
-        th.queue_work(range(10))
+        th.queue_work(list(range(10)))
         th.wait()
         res = []
         while not self.results.empty():
@@ -45,12 +45,12 @@ class thread_unittest(cli_mock.cli_unittest):
 
     def _threading(self, numthreads, count):
         th = threads.ThreadPool(self._workload, numthreads=numthreads)
-        th.queue_work(range(count))
+        th.queue_work(list(range(count)))
         th.wait()
         res = []
         while not self.results.empty():
             res.append(self.results.get())
-        self.assertEqualNoOrder([i * i for i in xrange(count)], res)
+        self.assertEqualNoOrder([i * i for i in range(count)], res)
 
     def test_threading(self):
         self._threading(10, 10)
@@ -60,13 +60,13 @@ class thread_unittest(cli_mock.cli_unittest):
 
     def test_threading_multi_queueing(self):
         th = threads.ThreadPool(self._workload, numthreads=5)
-        th.queue_work(range(5))
-        th.queue_work(range(5, 10))
+        th.queue_work(list(range(5)))
+        th.queue_work(list(range(5, 10)))
         th.wait()
         res = []
         while not self.results.empty():
             res.append(self.results.get())
-        self.assertEqualNoOrder([i * i for i in xrange(10)], res)
+        self.assertEqualNoOrder([i * i for i in range(10)], res)
 
 
 if __name__ == '__main__':
diff --git a/cli/topic_common.py b/cli/topic_common.py
index 1128113..e6ed019 100644
--- a/cli/topic_common.py
+++ b/cli/topic_common.py
@@ -61,7 +61,7 @@ import re
 import sys
 import textwrap
 import traceback
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 from autotest.cli import rpc
 from autotest.client.shared.test_utils import mock
 
@@ -150,7 +150,7 @@ def _get_item_key(item, key):
             raise ValueError('empty subkey in %r' % key)
         try:
             nested_item = nested_item[subkey]
-        except KeyError, e:
+        except KeyError as e:
             raise KeyError('%r - looking up key %r in %r' %
                            (e, key, nested_item))
     else:
@@ -266,18 +266,18 @@ class atest(object):
             self.failure(rest, item="", what_failed=msg)
 
     def invalid_syntax(self, msg):
-        print
-        print >> sys.stderr, msg
-        print
-        print "usage:",
-        print self._get_usage()
-        print
+        print()
+        print(msg, file=sys.stderr)
+        print()
+        print("usage:", end=' ')
+        print(self._get_usage())
+        print()
         sys.exit(1)
 
     def generic_error(self, msg):
         if self.debug:
             traceback.print_exc()
-        print >> sys.stderr, msg
+        print(msg, file=sys.stderr)
         sys.exit(1)
 
     def parse_json_exception(self, full_error):
@@ -305,7 +305,7 @@ class atest(object):
             errmsg = str(full_error).split('Traceback')[0].rstrip('\n')
 
         if self.kill_on_failure or fatal:
-            print >> sys.stderr, "%s\n    %s" % (what_failed, errmsg)
+            print("%s\n    %s" % (what_failed, errmsg), file=sys.stderr)
             sys.exit(1)
 
         # Build a dictionary with the 'what_failed' as keys.  The
@@ -318,7 +318,7 @@ class atest(object):
         # even if they contain the 'item'
         if item and item in errmsg:
             errmsg = errmsg.replace(item, FAIL_TAG)
-        if self.failed.has_key(what_failed):
+        if what_failed in self.failed:
             self.failed[what_failed].setdefault(errmsg, set()).add(item)
         else:
             self.failed[what_failed] = {errmsg: set([item])}
@@ -326,27 +326,27 @@ class atest(object):
     def show_all_failures(self):
         if not self.failed:
             return 0
-        for what_failed in self.failed.keys():
-            print >> sys.stderr, what_failed + ':'
-            for (errmsg, items) in self.failed[what_failed].iteritems():
+        for what_failed in list(self.failed.keys()):
+            print(what_failed + ':', file=sys.stderr)
+            for (errmsg, items) in self.failed[what_failed].items():
                 if len(items) == 0:
-                    print >> sys.stderr, errmsg
+                    print(errmsg, file=sys.stderr)
                 elif items == set(['']):
-                    print >> sys.stderr, '    ' + errmsg
+                    print('    ' + errmsg, file=sys.stderr)
                 elif len(items) == 1:
                     # Restore the only item
                     if FAIL_TAG in errmsg:
                         errmsg = errmsg.replace(FAIL_TAG, items.pop())
                     else:
                         errmsg = '%s (%s)' % (errmsg, items.pop())
-                    print >> sys.stderr, '    ' + errmsg
+                    print('    ' + errmsg, file=sys.stderr)
                 else:
-                    print >> sys.stderr, '    ' + errmsg + ' with <XYZ> in:'
+                    print('    ' + errmsg + ' with <XYZ> in:', file=sys.stderr)
                     twrap = textwrap.TextWrapper(initial_indent='        ',
                                                  subsequent_indent='        ')
                     items = list(items)
                     items.sort()
-                    print >> sys.stderr, twrap.fill(', '.join(items))
+                    print(twrap.fill(', '.join(items)), file=sys.stderr)
         return 1
 
     def __init__(self):
@@ -416,7 +416,7 @@ class atest(object):
                 values, leftover = item_parse_info.get_values(options,
                                                               leftover)
                 setattr(self, item_parse_info.attribute_name, values)
-        except CliError, s:
+        except CliError as s:
             self.invalid_syntax(s)
 
         if (req_items and not getattr(self, req_items, None)):
@@ -457,7 +457,7 @@ class atest(object):
         self.username = options.username
         try:
             self.afe = rpc.afe_comm(self.web_server, username=self.username)
-        except rpc.AuthError, s:
+        except rpc.AuthError as s:
             self.failure(str(s), fatal=True)
 
         return (options, leftover)
@@ -480,7 +480,7 @@ class atest(object):
         while retry:
             try:
                 return self.afe.run(op, **data)
-            except urllib2.URLError, err:
+            except urllib.error.URLError as err:
                 if hasattr(err, 'reason'):
                     if 'timed out' not in err.reason:
                         self.invalid_syntax('Invalid server name %s: %s' %
@@ -493,7 +493,7 @@ class atest(object):
                                  what_failed=("Error received from web server"))
                     raise CliError("Error from web server")
                 if self.debug:
-                    print 'retrying: %r %d' % (data, retry)
+                    print('retrying: %r %d' % (data, retry))
                 retry -= 1
                 if retry == 0:
                     if item:
@@ -506,7 +506,7 @@ class atest(object):
                     raise CliError("Timed-out contacting the Autotest server")
             except mock.CheckPlaybackError:
                 raise
-            except Exception, full_error:
+            except Exception as full_error:
                 # There are various exceptions throwns by JSON,
                 # urllib & httplib, so catch them all.
                 self.failure(full_error, item=item,
@@ -520,22 +520,22 @@ class atest(object):
         if len(values) == 0:
             return
         elif len(values) == 1:
-            print msg + ': '
+            print(msg + ': ')
         elif len(values) > 1:
             if msg.endswith('s'):
-                print msg + ': '
+                print(msg + ': ')
             else:
-                print msg + 's: '
+                print(msg + 's: ')
 
         values.sort()
 
         if 'AUTOTEST_CLI_NO_WRAP' in os.environ:
-            print '\n'.join(values)
+            print('\n'.join(values))
             return
 
         twrap = textwrap.TextWrapper(initial_indent='\t',
                                      subsequent_indent='\t')
-        print twrap.fill(', '.join(values))
+        print(twrap.fill(', '.join(values)))
 
     def __conv_value(self, type, value):
         return KEYS_CONVERT.get(type, str)(value)
@@ -545,12 +545,12 @@ class atest(object):
         if not items:
             return
         if title:
-            print title
+            print(title)
         for item in items:
             for key in keys:
-                print '%s: %s' % (KEYS_TO_NAMES_EN[key],
+                print('%s: %s' % (KEYS_TO_NAMES_EN[key],
                                   self.__conv_value(key,
-                                                    _get_item_key(item, key)))
+                                                    _get_item_key(item, key))))
 
     def print_fields_parse(self, items, keys, title=None):
         """Print the keys in each item as comma
@@ -562,7 +562,7 @@ class atest(object):
                       for key in keys
                       if self.__conv_value(key,
                                            _get_item_key(item, key)) != '']
-            print self.parse_delim.join(values)
+            print(self.parse_delim.join(values))
 
     def __find_justified_fmt(self, items, keys):
         """Find the max length for each field."""
@@ -571,7 +571,7 @@ class atest(object):
         # lines when the max is overlaps but the current values
         # are smaller
         if not items:
-            print "No results"
+            print("No results")
             return
         for key in keys[:-1]:
             lens[key] = max(len(self.__conv_value(key,
@@ -590,17 +590,17 @@ class atest(object):
             return
         fmt = self.__find_justified_fmt(items, keys_header)
         header = tuple(KEYS_TO_NAMES_EN[key] for key in keys_header)
-        print fmt % header
+        print(fmt % header)
         for item in items:
             values = tuple(self.__conv_value(key,
                                              _get_item_key(item, key))
                            for key in keys_header)
-            print fmt % values
+            print(fmt % values)
             if sublist_keys:
                 for key in sublist_keys:
                     self.print_wrapped(KEYS_TO_NAMES_EN[key],
                                        _get_item_key(item, key))
-                print '\n'
+                print('\n')
 
     def print_table_parse(self, items, keys_header, sublist_keys=()):
         """Print a mix of header and lists in a user readable
@@ -618,16 +618,16 @@ class atest(object):
                  for key in sublist_keys
                  if len(_get_item_key(item, key))]
 
-            print self.parse_delim.join(values)
+            print(self.parse_delim.join(values))
 
     def print_by_ids_std(self, items, title=None, line_before=False):
         """Prints ID & names of items in a user readable form"""
         if not items:
             return
         if line_before:
-            print
+            print()
         if title:
-            print title + ':'
+            print(title + ':')
         self.print_table_std(items, keys_header=['id', 'name'])
 
     def print_by_ids_parse(self, items, title=None, line_before=False):
@@ -635,7 +635,7 @@ class atest(object):
         if not items:
             return
         if title:
-            print title + '=',
+            print(title + '=', end=' ')
         values = []
         for item in items:
             values += ['%s=%s' % (KEYS_TO_NAMES_EN[key],
@@ -644,17 +644,17 @@ class atest(object):
                        for key in ['id', 'name']
                        if self.__conv_value(key,
                                             _get_item_key(item, key)) != '']
-        print self.parse_delim.join(values)
+        print(self.parse_delim.join(values))
 
     def print_list_std(self, items, key):
         """Print a wrapped list of results"""
         if not items:
             return
-        print ' '.join(_get_item_key(item, key) for item in items)
+        print(' '.join(_get_item_key(item, key) for item in items))
 
     def print_list_parse(self, items, key):
         """Print a wrapped list of results"""
         if not items:
             return
-        print '%s=%s' % (KEYS_TO_NAMES_EN[key],
-                         ','.join(_get_item_key(item, key) for item in items))
+        print('%s=%s' % (KEYS_TO_NAMES_EN[key],
+                         ','.join(_get_item_key(item, key) for item in items)))
diff --git a/cli/topic_common_unittest.py b/cli/topic_common_unittest.py
index 3d1a57d..43a0384 100755
--- a/cli/topic_common_unittest.py
+++ b/cli/topic_common_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -7,13 +7,13 @@
 import unittest
 import os
 import sys
-import StringIO
-import urllib2
+import io
+import urllib.request, urllib.error, urllib.parse
 
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, topic_common, rpc
 from autotest.frontend.afe.json_rpc import proxy
 
@@ -28,11 +28,11 @@ class topic_common_misc_tests(unittest.TestCase):
         self.assertRaises(KeyError, get_item_key, {}, 'a.')
         self.assertRaises(ValueError, get_item_key, {'a': {}}, 'a.')
         self.assertRaises(KeyError, get_item_key, {'a': {}}, 'a.b')
-        self.assertEquals(2, get_item_key({'a.b': 2, 'a': {}}, 'a.b'))
-        self.assertEquals(9, get_item_key({'a': {'b': 9}}, 'a.b'))
-        self.assertEquals(3, get_item_key({'a': {'b': {'c': 3}}}, 'a.b.c'))
-        self.assertEquals(5, get_item_key({'a': 5}, 'a'))
-        self.assertEquals({'b': 9}, get_item_key({'a': {'b': 9}}, 'a'))
+        self.assertEqual(2, get_item_key({'a.b': 2, 'a': {}}, 'a.b'))
+        self.assertEqual(9, get_item_key({'a': {'b': 9}}, 'a.b'))
+        self.assertEqual(3, get_item_key({'a': {'b': {'c': 3}}}, 'a.b.c'))
+        self.assertEqual(5, get_item_key({'a': 5}, 'a'))
+        self.assertEqual({'b': 9}, get_item_key({'a': {'b': 9}}, 'a'))
 
 
 class item_parse_info_unittest(cli_mock.cli_unittest):
@@ -307,18 +307,18 @@ class atest_unittest(cli_mock.cli_unittest):
                           self.atest.invalid_arg, 'This is bad')
         (output, err) = self.god.unmock_io()
         self.god.check_playback()
-        self.assert_(err.find('This is bad') >= 0)
+        self.assertTrue(err.find('This is bad') >= 0)
 
     def test_invalid_arg_continue(self):
         # The string will be placed into self.atest.failed
         self.atest.invalid_arg('This is sort of ok')
-        self.assert_('This is sort of ok' in self.atest.failed.keys())
+        self.assertTrue('This is sort of ok' in list(self.atest.failed.keys()))
 
     def test_failure_continue(self):
         self.atest.failure('This is partly bad', item='item0',
                            what_failed='something important')
         err = self.atest.failed['something important']
-        self.assert_('This is partly bad' in err.keys())
+        self.assertTrue('This is partly bad' in list(err.keys()))
 
     def test_failure_continue_multiple_different_errors(self):
         self.atest.failure('This is partly bad', item='item0',
@@ -326,11 +326,11 @@ class atest_unittest(cli_mock.cli_unittest):
         self.atest.failure('This is really bad', item='item0',
                            what_failed='something really important')
         err = self.atest.failed['something important']
-        self.assert_('This is partly bad' in err)
-        self.assert_('This is really bad' not in err)
+        self.assertTrue('This is partly bad' in err)
+        self.assertTrue('This is really bad' not in err)
         err = self.atest.failed['something really important']
-        self.assert_('This is partly bad' not in err)
-        self.assert_('This is really bad' in err)
+        self.assertTrue('This is partly bad' not in err)
+        self.assertTrue('This is really bad' in err)
 
     def test_failure_continue_multiple_same_errors(self):
         self.atest.failure('This is partly bad', item='item0',
@@ -338,10 +338,10 @@ class atest_unittest(cli_mock.cli_unittest):
         self.atest.failure('This is really bad', item='item1',
                            what_failed='something important')
         errs = self.atest.failed['something important']
-        self.assert_('This is partly bad' in errs)
-        self.assert_('This is really bad' in errs)
-        self.assert_(set(['item0']) in errs.values())
-        self.assert_(set(['item1']) in errs.values())
+        self.assertTrue('This is partly bad' in errs)
+        self.assertTrue('This is really bad' in errs)
+        self.assertTrue(set(['item0']) in list(errs.values()))
+        self.assertTrue(set(['item1']) in list(errs.values()))
 
     def test_failure_continue_multiple_errors_mixed(self):
         self.atest.failure('This is partly bad', item='item0',
@@ -351,16 +351,16 @@ class atest_unittest(cli_mock.cli_unittest):
         self.atest.failure('This is really bad', item='item1',
                            what_failed='something important')
         errs = self.atest.failed['something important']
-        self.assert_('This is partly bad' in errs)
-        self.assert_('This is really bad' in errs)
-        self.assert_(set(['item0']) in errs.values())
-        self.assert_(set(['item1']) in errs.values())
+        self.assertTrue('This is partly bad' in errs)
+        self.assertTrue('This is really bad' in errs)
+        self.assertTrue(set(['item0']) in list(errs.values()))
+        self.assertTrue(set(['item1']) in list(errs.values()))
 
         errs = self.atest.failed['something really important']
-        self.assert_('This is really bad' in errs)
-        self.assert_('This is partly bad' not in errs)
-        self.assert_(set(['item0']) in errs.values())
-        self.assert_(set(['item1']) not in errs.values())
+        self.assertTrue('This is really bad' in errs)
+        self.assertTrue('This is partly bad' not in errs)
+        self.assertTrue(set(['item0']) in list(errs.values()))
+        self.assertTrue(set(['item1']) not in list(errs.values()))
 
     def test_failure_continue_multiple_errors_mixed_same_error(self):
         self.atest.failure('This is partly bad', item='item0',
@@ -370,15 +370,15 @@ class atest_unittest(cli_mock.cli_unittest):
         self.atest.failure('This is partly bad', item='item1',
                            what_failed='something important')
         errs = self.atest.failed['something important']
-        self.assert_('This is partly bad' in errs)
-        self.assert_('This is really bad' not in errs)
-        self.assert_(set(['item0', 'item1']) in errs.values())
+        self.assertTrue('This is partly bad' in errs)
+        self.assertTrue('This is really bad' not in errs)
+        self.assertTrue(set(['item0', 'item1']) in list(errs.values()))
 
         errs = self.atest.failed['something really important']
-        self.assert_('This is really bad' in errs)
-        self.assert_('This is partly bad' not in errs)
-        self.assert_(set(['item0']) in errs.values())
-        self.assert_(set(['item1']) not in errs.values())
+        self.assertTrue('This is really bad' in errs)
+        self.assertTrue('This is partly bad' not in errs)
+        self.assertTrue(set(['item0']) in list(errs.values()))
+        self.assertTrue(set(['item1']) not in list(errs.values()))
 
     def test_failure_exit(self):
         self.atest.kill_on_failure = True
@@ -388,7 +388,7 @@ class atest_unittest(cli_mock.cli_unittest):
                           self.atest.failure, 'This is partly bad')
         (output, err) = self.god.unmock_io()
         self.god.check_playback()
-        self.assert_(err.find('This is partly bad') >= 0)
+        self.assertTrue(err.find('This is partly bad') >= 0)
 
     def test_failure_exit_item(self):
         self.atest.kill_on_failure = True
@@ -731,28 +731,28 @@ class atest_unittest(cli_mock.cli_unittest):
     def test_execute_rpc_bad_server(self):
         self.atest.afe = rpc.afe_comm('http://does_not_exist')
         self.god.mock_io()
-        rpc.afe_comm.run.expect_call('myop').and_raises(urllib2.URLError("<urlopen error (-2, 'Name or service not known')>"))
+        rpc.afe_comm.run.expect_call('myop').and_raises(urllib.error.URLError("<urlopen error (-2, 'Name or service not known')>"))
         sys.exit.expect_call(1).and_raises(cli_mock.ExitException)
         self.assertRaises(cli_mock.ExitException,
                           self.atest.execute_rpc, 'myop')
         (output, err) = self.god.unmock_io()
         self.god.check_playback()
-        self.assert_(err.find('http://does_not_exist') >= 0)
+        self.assertTrue(err.find('http://does_not_exist') >= 0)
 
     #
     # Print Unit tests
     #
     def __test_print_fields(self, func, expected, **dargs):
-        if not dargs.has_key('items'):
+        if 'items' not in dargs:
             dargs['items'] = [{'hostname': 'h0',
                                'platform': 'p0',
-                               'labels': [u'l0', u'l1'],
+                               'labels': ['l0', 'l1'],
                                'locked': 1,
                                'id': 'id0',
                                'name': 'name0'},
                               {'hostname': 'h1',
                                'platform': 'p1',
-                               'labels': [u'l2', u'l3'],
+                               'labels': ['l2', 'l3'],
                                'locked': 0,
                                'id': 'id1',
                                'name': 'name1'}]
@@ -871,7 +871,7 @@ class atest_unittest(cli_mock.cli_unittest):
                                          'name': 'name0'},
                                         {'hostname': 'h1',
                                          'platform': 'p1',
-                                         'labels': [u'l2', u'l3'],
+                                         'labels': ['l2', 'l3'],
                                          'locked': 0,
                                          'id': 'id1',
                                          'name': 'name1'}],
diff --git a/cli/user_unittest.py b/cli/user_unittest.py
index af82fa5..85f405e 100755
--- a/cli/user_unittest.py
+++ b/cli/user_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
@@ -11,7 +11,7 @@ import sys
 try:
     import autotest.common as common
 except ImportError:
-    import common
+    from . import common
 from autotest.cli import cli_mock, user
 
 
@@ -65,15 +65,15 @@ class user_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'user', 'list'],
                      rpcs=[('get_users', {},
                             True,
-                            [{u'access_level': 0,
-                              u'login': u'user0',
-                              u'id': 41},
-                             {u'access_level': 0,
-                              u'login': u'user5',
-                              u'id': 42},
-                             {u'access_level': 2,
-                              u'login': u'user0',
-                              u'id': 3}])],
+                            [{'access_level': 0,
+                              'login': 'user0',
+                              'id': 41},
+                             {'access_level': 0,
+                              'login': 'user5',
+                              'id': 42},
+                             {'access_level': 2,
+                              'login': 'user0',
+                              'id': 3}])],
                      out_words_ok=['user0', 'user5'],
                      out_words_no=['1', '3', '41', '42'])
 
@@ -81,9 +81,9 @@ class user_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'user', 'list', 'user0'],
                      rpcs=[('get_users', {'login__in': ['user0']},
                             True,
-                            [{u'access_level': 2,
-                              u'login': u'user0',
-                              u'id': 3}])],
+                            [{'access_level': 2,
+                              'login': 'user0',
+                              'id': 3}])],
                      out_words_ok=['user0'],
                      out_words_no=['2', '3'])
 
@@ -91,9 +91,9 @@ class user_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'user', 'list', '--acl', 'acl0'],
                      rpcs=[('get_users', {'aclgroup__name__in': ['acl0']},
                             True,
-                            [{u'access_level': 2,
-                              u'login': u'user0',
-                              u'id': 3}])],
+                            [{'access_level': 2,
+                              'login': 'user0',
+                              'id': 3}])],
                      out_words_ok=['user0'],
                      out_words_no=['2', '3'])
 
@@ -101,9 +101,9 @@ class user_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'user', 'list', '--access_level', '2'],
                      rpcs=[('get_users', {'access_level__in': ['2']},
                             True,
-                            [{u'access_level': 2,
-                              u'login': u'user0',
-                              u'id': 3}])],
+                            [{'access_level': 2,
+                              'login': 'user0',
+                              'id': 3}])],
                      out_words_ok=['user0'],
                      out_words_no=['2', '3'])
 
@@ -111,15 +111,15 @@ class user_list_unittest(cli_mock.cli_unittest):
         self.run_cmd(argv=['atest', 'user', 'list', '--verbose'],
                      rpcs=[('get_users', {},
                             True,
-                            [{u'access_level': 0,
-                              u'login': u'user0',
-                              u'id': 41},