Index: lnt/lnttool/admin.py
===================================================================
--- lnt/lnttool/admin.py
+++ lnt/lnttool/admin.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 import click
Index: lnt/server/db/migrations/upgrade_11_to_12.py
===================================================================
--- lnt/server/db/migrations/upgrade_11_to_12.py
+++ lnt/server/db/migrations/upgrade_11_to_12.py
@@ -1,5 +1,6 @@
 # Rename 'name' field in machine parameters to 'hostname' to avoid name clash
 # in import/export file format.
+from builtins import object
 import sqlalchemy
 import json
 
Index: lnt/server/db/migrations/upgrade_1_to_2.py
===================================================================
--- lnt/server/db/migrations/upgrade_1_to_2.py
+++ lnt/server/db/migrations/upgrade_1_to_2.py
@@ -8,6 +8,7 @@
 # So, for this upgrade, we go look for runs that used the older run_order
 # extraction, and we recompute the run order for them.
 
+from builtins import object
 import json
 import re
 
Index: lnt/server/db/testsuite.py
===================================================================
--- lnt/server/db/testsuite.py
+++ lnt/server/db/testsuite.py
@@ -3,6 +3,7 @@
 """
 
 from __future__ import absolute_import
+from builtins import object
 import json
 import lnt
 from . import util
Index: lnt/server/db/testsuitedb.py
===================================================================
--- lnt/server/db/testsuitedb.py
+++ lnt/server/db/testsuitedb.py
@@ -6,6 +6,7 @@
 """
 
 from __future__ import absolute_import
+from builtins import object
 import datetime
 import json
 import os
Index: lnt/server/db/v4db.py
===================================================================
--- lnt/server/db/v4db.py
+++ lnt/server/db/v4db.py
@@ -1,3 +1,4 @@
+from builtins import object
 import glob
 import yaml
 
Index: lnt/server/instance.py
===================================================================
--- lnt/server/instance.py
+++ lnt/server/instance.py
@@ -1,3 +1,4 @@
+from builtins import object
 import os
 import shutil
 import tarfile
Index: lnt/server/reporting/analysis.py
===================================================================
--- lnt/server/reporting/analysis.py
+++ lnt/server/reporting/analysis.py
@@ -2,6 +2,7 @@
 Utilities for helping with the analysis of data, for reporting purposes.
 """
 from __future__ import division
+from builtins import object
 from past.utils import old_div
 from lnt.testing import FAIL
 from lnt.util import logger
Index: lnt/server/reporting/dailyreport.py
===================================================================
--- lnt/server/reporting/dailyreport.py
+++ lnt/server/reporting/dailyreport.py
@@ -1,4 +1,5 @@
 from __future__ import division
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 from past.utils import old_div
Index: lnt/server/reporting/latestrunsreport.py
===================================================================
--- lnt/server/reporting/latestrunsreport.py
+++ lnt/server/reporting/latestrunsreport.py
@@ -1,3 +1,4 @@
+from builtins import object
 from lnt.server.reporting.analysis import REGRESSED, UNCHANGED_FAIL
 from lnt.server.reporting.report import RunResult, RunResults, report_css_styles
 import lnt.server.reporting.analysis
Index: lnt/server/reporting/summaryreport.py
===================================================================
--- lnt/server/reporting/summaryreport.py
+++ lnt/server/reporting/summaryreport.py
@@ -1,4 +1,5 @@
 from __future__ import division
+from builtins import object
 from past.utils import old_div
 import re
 
Index: lnt/server/ui/app.py
===================================================================
--- lnt/server/ui/app.py
+++ lnt/server/ui/app.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 import io
Index: lnt/server/ui/regression_views.py
===================================================================
--- lnt/server/ui/regression_views.py
+++ lnt/server/ui/regression_views.py
@@ -1,3 +1,4 @@
+from builtins import object
 import flask
 import sqlalchemy
 import json
Index: lnt/server/ui/views.py
===================================================================
--- lnt/server/ui/views.py
+++ lnt/server/ui/views.py
@@ -1,4 +1,5 @@
 from __future__ import division
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 from past.utils import old_div
Index: lnt/testing/__init__.py
===================================================================
--- lnt/testing/__init__.py
+++ lnt/testing/__init__.py
@@ -6,6 +6,7 @@
 convert them to JSON data suitable for submitting to the server.
 """
 
+from builtins import object
 import datetime
 import re
 from lnt.util import logger
Index: lnt/testing/profile/profile.py
===================================================================
--- lnt/testing/profile/profile.py
+++ lnt/testing/profile/profile.py
@@ -1,3 +1,4 @@
+from builtins import object
 import base64
 import lnt.testing.profile
 import os
Index: lnt/testing/profile/profilev2impl.py
===================================================================
--- lnt/testing/profile/profilev2impl.py
+++ lnt/testing/profile/profilev2impl.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 from .profile import ProfileImpl
Index: lnt/testing/util/misc.py
===================================================================
--- lnt/testing/util/misc.py
+++ lnt/testing/util/misc.py
@@ -1,3 +1,4 @@
+from builtins import object
 import datetime
 
 
Index: lnt/testing/util/valgrind.py
===================================================================
--- lnt/testing/util/valgrind.py
+++ lnt/testing/util/valgrind.py
@@ -1,6 +1,7 @@
 """
 Utilities for working with Valgrind.
 """
+from builtins import object
 from lnt.util import logger
 
 # See:
Index: lnt/tests/builtintest.py
===================================================================
--- lnt/tests/builtintest.py
+++ lnt/tests/builtintest.py
@@ -3,6 +3,7 @@
 """
 
 from __future__ import print_function
+from builtins import object
 import sys
 import os
 
Index: lnt/tests/nt.py
===================================================================
--- lnt/tests/nt.py
+++ lnt/tests/nt.py
@@ -1,6 +1,7 @@
 """LLVM test-suite compile and execution tests"""
 from __future__ import absolute_import
 from __future__ import print_function
+from builtins import object
 from future import standard_library
 standard_library.install_aliases()
 import csv
Index: tests/SharedInputs/FakeCompilers/fakecompiler.py
===================================================================
--- tests/SharedInputs/FakeCompilers/fakecompiler.py
+++ tests/SharedInputs/FakeCompilers/fakecompiler.py
@@ -5,6 +5,7 @@
 """
 from __future__ import print_function
 
+from builtins import object
 import inspect
 import os
 import sys