Backed out changeset 5c3005879c35 (bug 1634187) for causing build bus…

…tages at builds/worker/checkouts/gecko/xpcom/idl-parser/xpidl/runtests.py

CLOSED TREE

accessible/xpcom/AccEventGen.py

@@ -11,11 +11,13 @@
 import buildconfig
 import mozpack.path as mozpath
 
-# The xpidl parser cache directory is not incorporated in the in-tree virtualenv.
+# The xpidl parser is not incorporated in the in-tree virtualenv.
+xpidl_dir = mozpath.join(buildconfig.topsrcdir, 'xpcom', 'idl-parser',
+                         'xpidl')
 xpidl_cachedir = mozpath.join(buildconfig.topobjdir, 'xpcom', 'idl-parser',
                               'xpidl')
-sys.path.append(xpidl_cachedir)
-from xpidl import xpidl
+sys.path.extend([xpidl_dir, xpidl_cachedir])
+import xpidl
 
 # Load the webidl configuration file.
 glbl = {}

build/virtualenv_packages.txt

@@ -110,5 +110,4 @@ mozilla.pth:third_party/python/pyasn1
 mozilla.pth:third_party/python/pyasn1-modules
 mozilla.pth:third_party/python/rsa
 mozilla.pth:toolkit/components/telemetry/tests/marionette/harness
-mozilla.pth:xpcom/idl-parser
 optional:packages.txt:comm/build/virtualenv_packages.txt

xpcom/idl-parser/xpidl/header.py

@@ -7,12 +7,10 @@
 
 """Print a C++ header file for the IDL files specified on the command line"""
 
-from __future__ import absolute_import
-
 import sys
 import os.path
 import re
-from xpidl import xpidl
+import xpidl
 import itertools
 import glob
 

xpcom/idl-parser/xpidl/jsonxpt.py

@@ -7,9 +7,7 @@
 
 """Generate a json XPT typelib for an IDL file"""
 
-from __future__ import absolute_import
-
-from xpidl import xpidl
+import xpidl
 import json
 import itertools
 

xpcom/idl-parser/xpidl/runtests.py

@@ -5,12 +5,10 @@
 #
 # Unit tests for xpidl.py
 
-from __future__ import absolute_import
-
 import mozunit
 import unittest
-from xpidl import xpidl
-from xpidl import header
+import xpidl
+import header
 
 
 class TestParser(unittest.TestCase):

xpcom/idl-parser/xpidl/rust.py

@@ -34,11 +34,9 @@
 # and when possible we should avoid doing so. We don't generate bindings for
 # these methods here currently.
 
-from __future__ import absolute_import
-
 import os.path
 import re
-from xpidl import xpidl
+import xpidl
 
 
 class AutoIndent(object):

xpcom/idl-parser/xpidl/rust_macros.py

@@ -6,10 +6,8 @@
 
 """Generate rust bindings information for the IDL file specified"""
 
-from __future__ import absolute_import
-
-from xpidl import rust
-from xpidl import xpidl
+import rust
+import xpidl
 
 
 derive_method_tmpl = """\

xpcom/idl-parser/xpidl/xpidl.py

@@ -7,8 +7,6 @@
 
 """A parser for cross-platform IDL (XPIDL) files."""
 
-from __future__ import absolute_import
-
 import sys
 import os.path
 import re