Backed out changeset dbe60b600dc0 (bug 1397853) for failining linter py-compat at testing/mochitest/runtests.py:2236. r=backout

testing/mochitest/bisection.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
 import math
 import mozinfo
 
@@ -277,6 +275,6 @@ class Bisect(object):
 
     def print_summary(self):
         "This method is used to print the recorded summary."
-        print("Bisection summary:")
+        print "Bisection summary:"
         for line in self.summary:
-            print(line)
+            print line

testing/mochitest/leaks.py

@@ -5,8 +5,6 @@
 # The content of this file comes orginally from automationutils.py
 # and *should* be revised.
 
-from __future__ import absolute_import, print_function
-
 import re
 from operator import itemgetter
 

testing/mochitest/mach_commands.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from argparse import Namespace
 from collections import defaultdict

testing/mochitest/mach_test_package_commands.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import os
 from argparse import Namespace

testing/mochitest/mochitest_options.py

@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 from abc import ABCMeta, abstractmethod, abstractproperty
 from argparse import ArgumentParser, SUPPRESS
 from distutils.util import strtobool

testing/mochitest/pywebsocket_wrapper.py

@@ -9,8 +9,6 @@ SIGINT.
 
 """
 
-from __future__ import absolute_import
-
 import signal
 import sys
 

testing/mochitest/rungeckoview.py

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, print_function
 
 import posixpath
 import shutil
@@ -193,8 +192,8 @@ class GeckoviewTestRunner:
                 # minidumps directory is automatically created when the app
                 # (first) starts, so its lack of presence is a hint that
                 # something went wrong.
-                print("Automation Error: No crash directory (%s) found on remote device" %
-                      remote_dir)
+                print "Automation Error: No crash directory (%s) found on remote device" % \
+                    remote_dir
                 # Whilst no crash was found, the run should still display as a failure
                 return True
             self.dm.getDirectory(remote_dir, dump_dir)

testing/mochitest/runrobocop.py

@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, print_function
-
 import json
 import os
 import sys
@@ -532,9 +530,9 @@ class RobocopTestRunner(MochitestDesktop):
                 "No tests run. Did you pass an invalid TEST_PATH?")
             worstTestResult = 1
         else:
-            print("INFO | runtests.py | Test summary: start.")
+            print "INFO | runtests.py | Test summary: start."
             logResult = self.logTestSummary()
-            print("INFO | runtests.py | Test summary: end.")
+            print "INFO | runtests.py | Test summary: end."
             if worstTestResult == 0:
                 worstTestResult = logResult
         return worstTestResult

testing/mochitest/runtests.py

@@ -6,8 +6,7 @@
 Runs the Mochitest test harness.
 """
 
-from __future__ import absolute_import, print_function, with_statement
-
+from __future__ import with_statement
 import os
 import sys
 SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(__file__)))

testing/mochitest/runtestsremote.py

@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 import os
 import sys
 import traceback

testing/mochitest/tests/python/conftest.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import print_function, unicode_literals
 import json
 import os
 from argparse import Namespace

testing/mochitest/tests/python/test_basic_mochitest_plain.py

@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 import os
 from functools import partial
 

testing/mochitest/tests/python/test_get_active_tests.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import print_function, unicode_literals
 
 import os
 from argparse import Namespace

tools/lint/py2.yml

@@ -41,7 +41,7 @@ py2:
         - testing/gtest
         - testing/instrumentation/runinstrumentation.py
         - testing/marionette
-        - testing/mochitest/pywebsocket
+        - testing/mochitest
         - testing/mozbase
         - testing/mozharness
         - testing/remotecppunittests.py

tools/lint/py3.yml

@@ -32,7 +32,7 @@ py3:
         - testing/firefox-ui/harness/firefox_ui_harness/runners/update.py
         - testing/gtest
         - testing/marionette
-        - testing/mochitest/pywebsocket
+        - testing/mochitest
         - testing/mozbase
         - testing/mozharness
         - testing/tools/iceserver