Bug 1559975 - Make python/mach lint with 'py2' and 'py3' r=catlee

Depends on D36096

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

--HG--
extra : moz-landing-system : lando

python/mach/mach/dispatcher.py

@@ -2,6 +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 print_function
 from __future__ import absolute_import, unicode_literals
 
 import argparse

python/mach/mach/registrar.py

@@ -2,6 +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 print_function
 from __future__ import absolute_import, unicode_literals
 
 from .base import MachError

python/mach/mach/test/common.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 import os

python/mach/mach/test/invoke_mach_command.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import subprocess
 import sys
 

python/mach/mach/test/providers/basic.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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 unicode_literals
 
 from mach.decorators import (

python/mach/mach/test/providers/conditions.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 from mach.decorators import (

python/mach/mach/test/providers/conditions_invalid.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 from mach.decorators import (

python/mach/mach/test/providers/throw.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 from mach.decorators import (

python/mach/mach/test/providers/throw2.py

@@ -6,6 +6,8 @@
 # exceptions that occur in mach command modules themselves and in the things
 # they call.
 
+from __future__ import absolute_import
+
 
 def throw_deep(message):
     return throw_real(message)

python/mach/mach/test/registrar_dispatch.py

@@ -1,3 +1,4 @@
 # This code is loaded via `mach python --exec-file`, so it runs in the scope of
 # the `mach python` command.
+from __future__ import absolute_import
 self._mach_context.commands.dispatch('uuid', self._mach_context)  # noqa: F821

python/mach/mach/test/test_conditions.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 import os

python/mach/mach/test/test_config.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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 unicode_literals
 
 import sys

python/mach/mach/test/test_dispatcher.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 import os

python/mach/mach/test/test_entry_point.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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 unicode_literals
 
 import imp

python/mach/mach/test/test_error_output.py

@@ -2,6 +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
 from __future__ import unicode_literals
 
 from mach.main import (

python/mach/mach/test/zero_microseconds.py

@@ -1,5 +1,6 @@
 # This code is loaded via `mach python --exec-file`, so it runs in the scope of
 # the `mach python` command.
+from __future__ import absolute_import
 old = self._mach_context.post_dispatch_handler  # noqa: F821
 
 

python/mach/setup.py

@@ -2,6 +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
 try:
     from setuptools import setup
 except ImportError:

tools/lint/py2.yml

@@ -22,7 +22,6 @@ py2:
         - nsprpub
         - other-licenses
         - python/devtools
-        - python/mach
         - security
         - servo
         - taskcluster/docker/funsize-update-generator