Backed out 5 changesets (bug 1559982, bug 1559975) for cpp unit test failures due to unsupported operand type. CLOSED TREE

Backed out changeset 2309aac6cea3 (bug 1559975)
Backed out changeset bf5a6d853abd (bug 1559975)
Backed out changeset 0c36f78c971a (bug 1559975)
Backed out changeset 0560cf7df7dc (bug 1559975)
Backed out changeset 4cb64ca524e7 (bug 1559982)

testing/firefox-ui/harness/firefox_ui_harness/runners/update.py

@@ -105,4 +105,4 @@ class UpdateTestRunner(FirefoxUITestRunner):
         # If exceptions happened, re-throw the last one
         if self.exc_info:
             ex_type, exception, tb = self.exc_info
-            raise ex_type(exception).with_traceback(tb)
+            raise ex_type, exception, tb

testing/gtest/rungtests.py

@@ -210,7 +210,7 @@ def main():
                                   options.cwd,
                                   symbols_path=options.symbols_path,
                                   utility_path=options.utility_path)
-    except Exception as e:
+    except Exception, e:
         log.error(str(e))
         result = False
     sys.exit(0 if result else 1)

testing/remotecppunittests.py

@@ -4,7 +4,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 os
 import sys
 import subprocess

testing/runcppunittests.py

@@ -4,7 +4,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, with_statement
+from __future__ import with_statement
 import sys
 import os
 from optparse import OptionParser

tools/lint/py2.yml

@@ -39,6 +39,8 @@ py2:
         - testing/mochitest
         - testing/mozharness
         - testing/raptor
+        - testing/remotecppunittests.py
+        - testing/runcppunittests.py
         - testing/runtimes
         - testing/tools
         - testing/tps

tools/lint/py3.yml

@@ -25,6 +25,8 @@ py3:
         - security/manager/ssl
         - servo
         - testing/awsy
+        - testing/firefox-ui/harness/firefox_ui_harness/runners/update.py
+        - testing/gtest
         - testing/mochitest
         - testing/mozharness
         - testing/raptor
@@ -35,6 +37,7 @@ py3:
         - tools/jprof
         - tools/profiler
         - tools/rb
+        - tools/update-packaging
         - xpcom/idl-parser
     extensions: ['py']
     support-files:

tools/lint/python/check_compat.py

@@ -38,16 +38,11 @@ def check_compat_py2(f):
     futures = set()
     haveprint = False
     future_lineno = 1
-    may_have_relative_imports = False
     for node in ast.walk(root):
         if isinstance(node, ast.ImportFrom):
             if node.module == '__future__':
                 future_lineno = node.lineno
                 futures |= set(n.name for n in node.names)
-            else:
-                may_have_relative_imports = True
-        elif isinstance(node, ast.Import):
-            may_have_relative_imports = True
         elif isinstance(node, ast.Print):
             haveprint = True
 
@@ -57,7 +52,7 @@ def check_compat_py2(f):
         'column': 1,
     }
 
-    if 'absolute_import' not in futures and may_have_relative_imports:
+    if 'absolute_import' not in futures:
         err['rule'] = 'require absolute_import'
         err['message'] = 'Missing from __future__ import absolute_import'
         print(json.dumps(err))