Bug 1632916 - Run JS/web-platform/ipdl build machinery in Python 3 r=jgraham,nika,glandium

Differential Revision: https://phabricator.services.mozilla.com/D72478

Author: Ricky Stewart

config/check_vanilla_allocations.py

@@ -38,8 +38,7 @@
 # mismatched alloc/free checking.
 # ----------------------------------------------------------------------------
 
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 import argparse
 import re
@@ -112,7 +111,7 @@ def main():
         ]
 
     # This is like alloc_fns, but regexp chars are not escaped.
-    alloc_fns_unescaped = [fn.translate(None, r'\\') for fn in alloc_fns]
+    alloc_fns_unescaped = [fn.replace('\\', '') for fn in alloc_fns]
 
     # This regexp matches the relevant lines in the output of |nm|, which look
     # like the following.

config/config.mk

@@ -112,7 +112,7 @@ MKDIR ?= mkdir
 SLEEP ?= sleep
 TOUCH ?= touch
 
-PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
+PYTHON_PATH = $(PYTHON3) $(topsrcdir)/config/pythonpath.py
 
 #
 # Build using PIC by default

config/pythonpath.py

@@ -2,16 +2,17 @@
 # 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 __future__ import print_function
+from __future__ import absolute_import, print_function, unicode_literals
+
+
 """
 Run a python script, adding extra directories to the python path.
 """
 
 
 def main(args):
     def usage():
-        print >>sys.stderr, "pythonpath.py -I directory script.py [args...]"
+        print("pythonpath.py -I directory script.py [args...]", file=sys.stderr)
         sys.exit(150)
 
     paths = []
@@ -47,14 +48,14 @@ def usage():
     frozenglobals['__name__'] = '__main__'
     frozenglobals['__file__'] = script
 
-    execfile(script, frozenglobals)
+    exec(open(script, encoding='utf-8').read(), frozenglobals)
 
 
 # Freeze scope here ... why this makes things work I have no idea ...
 frozenglobals = globals()
 
-import sys
 import os
+import sys
 
 if __name__ == '__main__':
     main(sys.argv[1:])

ipc/ipdl/Makefile.in

@@ -22,7 +22,7 @@ ipdl_py_deps := \
 # NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself,
 # which is why we don't have explicit .h/.cpp targets here
 ipdl.track: $(ALL_IPDLSRCS) $(srcdir)/sync-messages.ini $(srcdir)/message-metadata.ini $(ipdl_py_deps)
-	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
+	$(PYTHON3) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) \
 	  $(srcdir)/ipdl.py \
 	  --sync-msg-list=$(srcdir)/sync-messages.ini \

ipc/ipdl/ipdl.py

@@ -3,11 +3,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import print_function
 
+from io import StringIO
 import optparse
 import os
 import sys
-from cStringIO import StringIO
-from ConfigParser import RawConfigParser
+from configparser import RawConfigParser
 
 import ipdl
 

ipc/ipdl/ipdl/__init__.py

@@ -9,7 +9,7 @@
 
 import os
 import sys
-from cStringIO import StringIO
+from io import StringIO
 
 from ipdl.cgen import IPDLCodeGen
 from ipdl.lower import LowerToCxx, msgenums
@@ -75,6 +75,7 @@ def genmsgenum(ast):
 
 
 def writeifmodified(contents, file):
+    contents = contents.encode('utf-8')
     dir = os.path.dirname(file)
     os.path.exists(dir) or os.makedirs(dir)
 

ipc/ipdl/ipdl/cxx/ast.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import copy
+import functools
 
 
 class Visitor:
@@ -442,6 +443,7 @@ def __init__(self, params=[], ret=Type('void')):
         self.ret = ret
 
 
+@functools.total_ordering
 class Typedef(Node):
     def __init__(self, fromtype, totypename, templateargs=[]):
         assert isinstance(totypename, str)
@@ -451,12 +453,12 @@ def __init__(self, fromtype, totypename, templateargs=[]):
         self.totypename = totypename
         self.templateargs = templateargs
 
-    def __cmp__(self, o):
-        return cmp(self.totypename, o.totypename)
+    def __lt__(self, other):
+        return self.totypename < other.totypename
 
-    def __eq__(self, o):
-        return (self.__class__ == o.__class__
-                and 0 == cmp(self, o))
+    def __eq__(self, other):
+        return (self.__class__ == other.__class__
+                and self.totypename == other.totypename)
 
     def __hash__(self):
         return hash(self.totypename)

ipc/ipdl/ipdl/cxx/code.py

@@ -11,7 +11,6 @@
 # API are often easier to read than users of the AST APIs in these cases.
 
 import re
-import sys
 import math
 import textwrap
 
@@ -140,7 +139,7 @@ def _line(raw, skip_indent, lineno, context):
             values = eval(expr, context, {})
         except Exception as e:
             msg = "%s in substitution on line %d" % (repr(e), lineno)
-            raise ValueError(msg), None, sys.exc_traceback
+            raise ValueError(msg) from e
 
         # If we aren't dealing with lists, wrap the result into a
         # single-element list.

ipc/ipdl/ipdl/lower.py

@@ -1450,7 +1450,7 @@ def visitStructDecl(self, sd):
 
             # Compute a permutation of the fields for in-memory storage such
             # that the memory layout of the structure will be well-packed.
-            permutation = range(len(newfields))
+            permutation = list(range(len(newfields)))
 
             # Note that the results of `pod_size` ensure that non-POD fields
             # sort before POD ones.

ipc/ipdl/ipdl/type.py

@@ -125,10 +125,10 @@ def typename(self):
         return self.__class__.__name__
 
     def name(self):
-        raise NotImplementedError
+        raise NotImplementedError()
 
     def fullname(self):
-        raise NotImplementedError
+        raise NotImplementedError()
 
     def accept(self, visitor, *args):
         visit = getattr(visitor, 'visit' + self.__class__.__name__, None)
@@ -229,8 +229,18 @@ def hasBaseType(self): return False
 
     @classmethod
     def convertsTo(cls, lesser, greater):
-        if (lesser.nestedRange[0] < greater.nestedRange[0] or
-                lesser.nestedRange[1] > greater.nestedRange[1]):
+        def _unwrap(nr):
+            if isinstance(nr, dict):
+                return _unwrap(nr['nested'])
+            elif isinstance(nr, int):
+                return nr
+            else:
+                raise ValueError('Got unexpected nestedRange value: %s' % nr)
+
+        lnr0, gnr0, lnr1, gnr1 = (
+            _unwrap(lesser.nestedRange[0]), _unwrap(greater.nestedRange[0]),
+            _unwrap(lesser.nestedRange[1]), _unwrap(greater.nestedRange[1]))
+        if (lnr0 < gnr0 or lnr1 > gnr1):
             return False
 
         # Protocols that use intr semantics are not allowed to use
@@ -593,7 +603,7 @@ def iteractortypes(t, visited=None):
 
 def hasshmem(type):
     """Return true iff |type| is shmem or has it buried within."""
-    class found:
+    class found(BaseException):
         pass
 
     class findShmem(TypeVisitor):