From 8125df23f2787b317ac0441931481097cedd8e57 Mon Sep 17 00:00:00 2001
From: Ricky Stewart <rstewart@mozilla.com>
Date: Thu, 12 Dec 2019 00:13:25 +0000
Subject: [PATCH] Bug 1603181 - mozbuild/preprocessor.py and
 test_preprocessor.py support Python3 r=froydnj

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

--HG--
extra : moz-landing-system : lando
---
 python/mozbuild/mozbuild/preprocessor.py         | 16 ++++++----------
 python/mozbuild/mozbuild/test/python.ini         |  1 +
 python/mozbuild/mozbuild/test/python2.ini        |  1 -
 .../mozbuild/mozbuild/test/test_preprocessor.py  |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
index 18d2184b8e06..d5feecb52762 100644
--- a/python/mozbuild/mozbuild/preprocessor.py
+++ b/python/mozbuild/mozbuild/preprocessor.py
@@ -324,14 +324,14 @@ class Preprocessor:
         for cmd, level in (
             ('define', 0),
             ('undef', 0),
-            ('if', sys.maxint),
-            ('ifdef', sys.maxint),
-            ('ifndef', sys.maxint),
+            ('if', sys.maxsize),
+            ('ifdef', sys.maxsize),
+            ('ifndef', sys.maxsize),
             ('else', 1),
             ('elif', 1),
             ('elifdef', 1),
             ('elifndef', 1),
-            ('endif', sys.maxint),
+            ('endif', sys.maxsize),
             ('expand', 0),
             ('literal', 0),
             ('filter', 0),
@@ -730,9 +730,7 @@ class Preprocessor:
         current = dict(self.filters)
         for f in filters:
             current[f] = getattr(self, 'filter_' + f)
-        filterNames = current.keys()
-        filterNames.sort()
-        self.filters = [(fn, current[fn]) for fn in filterNames]
+        self.filters = [(fn, current[fn]) for fn in sorted(current.keys())]
         return
 
     def do_unfilter(self, args):
@@ -741,9 +739,7 @@ class Preprocessor:
         for f in filters:
             if f in current:
                 del current[f]
-        filterNames = current.keys()
-        filterNames.sort()
-        self.filters = [(fn, current[fn]) for fn in filterNames]
+        self.filters = [(fn, current[fn]) for fn in sorted(current.keys())]
         return
 
     # Filters
diff --git a/python/mozbuild/mozbuild/test/python.ini b/python/mozbuild/mozbuild/test/python.ini
index 87820793b19b..9e353e64f503 100644
--- a/python/mozbuild/mozbuild/test/python.ini
+++ b/python/mozbuild/mozbuild/test/python.ini
@@ -3,5 +3,6 @@ subsuite = mozbuild
 
 [test_expression.py]
 [test_licenses.py]
+[test_preprocessor.py]
 [test_pythonutil.py]
 [test_util_fileavoidwrite.py]
diff --git a/python/mozbuild/mozbuild/test/python2.ini b/python/mozbuild/mozbuild/test/python2.ini
index 7a3b32aa03d2..b2a5411908e2 100644
--- a/python/mozbuild/mozbuild/test/python2.ini
+++ b/python/mozbuild/mozbuild/test/python2.ini
@@ -45,5 +45,4 @@ skip-if = (os == "win")
 [test_makeutil.py]
 [test_mozconfig.py]
 [test_mozinfo.py]
-[test_preprocessor.py]
 [test_util.py]
diff --git a/python/mozbuild/mozbuild/test/test_preprocessor.py b/python/mozbuild/mozbuild/test/test_preprocessor.py
index 947604e4c307..f5955461736e 100644
--- a/python/mozbuild/mozbuild/test/test_preprocessor.py
+++ b/python/mozbuild/mozbuild/test/test_preprocessor.py
@@ -6,9 +6,9 @@ from __future__ import absolute_import, print_function
 
 import unittest
 
-from StringIO import StringIO
 import os
 import shutil
+from six import StringIO
 
 from tempfile import mkdtemp