Bug 1878964 - Remove mozbuild.exec_. r=firefox-build-system-reviewers,sergesanspaille

Its comment says:

> Wrapper around the exec statement to avoid bogus errors like:
> (snip)
> which happen with older versions of python 2.7.

IOW, it's been useless ever since we dropped support for python 2.7.

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

Author: glandium

python/mozbuild/mozbuild/configure/__init__.py

@@ -30,7 +30,6 @@
 from mozbuild.util import (
     ReadOnlyDict,
     ReadOnlyNamespace,
-    exec_,
     memoize,
     memoized_property,
     system_encoding,
@@ -491,7 +490,7 @@ def include_file(self, path):
             source = fh.read()
 
         code = self.get_compiled_source(source, path)
-        exec_(code, self)
+        exec(code, self)
 
         self._paths.pop(-1)
 
@@ -1017,21 +1016,21 @@ def _recursively_get_property(self, module, what, wrapped):
     @memoized_property
     def _wrapped_os(self):
         wrapped_os = {}
-        exec_("from os import *", {}, wrapped_os)
+        exec("from os import *", {}, wrapped_os)
         # Special case os and os.environ so that os.environ is our copy of
         # the environment.
         wrapped_os["environ"] = self._environ
         # Also override some os.path functions with ours.
         wrapped_path = {}
-        exec_("from os.path import *", {}, wrapped_path)
+        exec("from os.path import *", {}, wrapped_path)
         wrapped_path.update(self.OS.path.__dict__)
         wrapped_os["path"] = ReadOnlyNamespace(**wrapped_path)
         return ReadOnlyNamespace(**wrapped_os)
 
     @memoized_property
     def _wrapped_subprocess(self):
         wrapped_subprocess = {}
-        exec_("from subprocess import *", {}, wrapped_subprocess)
+        exec("from subprocess import *", {}, wrapped_subprocess)
 
         def wrap(function):
             def wrapper(*args, **kwargs):
@@ -1055,11 +1054,11 @@ def _wrapped_six(self):
         if six.PY3:
             return six
         wrapped_six = {}
-        exec_("from six import *", {}, wrapped_six)
+        exec("from six import *", {}, wrapped_six)
         wrapped_six_moves = {}
-        exec_("from six.moves import *", {}, wrapped_six_moves)
+        exec("from six.moves import *", {}, wrapped_six_moves)
         wrapped_six_moves_builtins = {}
-        exec_("from six.moves.builtins import *", {}, wrapped_six_moves_builtins)
+        exec("from six.moves.builtins import *", {}, wrapped_six_moves_builtins)
 
         # Special case for the open() builtin, because otherwise, using it
         # fails with "IOError: file() constructor not accessible in
@@ -1104,7 +1103,7 @@ def _get_one_import(self, _from, _import, _as, glob):
             _import,
             (" as %s" % _as) if _as else "",
         )
-        exec_(import_line, {}, glob)
+        exec(import_line, {}, glob)
 
     def _resolve_and_set(self, data, name, value, when=None):
         # Don't set anything when --help was on the command line

python/mozbuild/mozbuild/frontend/sandbox.py

@@ -24,7 +24,7 @@
 import six
 from mozpack.files import FileFinder
 
-from mozbuild.util import ReadOnlyDict, exec_
+from mozbuild.util import ReadOnlyDict
 
 from .context import Context
 
@@ -181,7 +181,7 @@ def execute():
             old_source = self._current_source
             self._current_source = source
             try:
-                exec_(code, self)
+                exec(code, self)
             finally:
                 self._current_source = old_source
 

python/mozbuild/mozbuild/test/configure/test_checks_configure.py

@@ -15,7 +15,6 @@
 from common import ConfigureTestSandbox, ensure_exe_extension, fake_short_path
 from mozbuild.configure import ConfigureError, ConfigureSandbox
 from mozbuild.shellutil import quote as shell_quote
-from mozbuild.util import exec_
 
 
 class TestChecksConfigure(unittest.TestCase):
@@ -26,7 +25,7 @@ def test(val, msg):
                 sandbox = ConfigureSandbox({}, stdout=out, stderr=out)
                 base_dir = os.path.join(topsrcdir, "build", "moz.configure")
                 sandbox.include_file(os.path.join(base_dir, "checks.configure"))
-                exec_(to_exec, sandbox)
+                exec(to_exec, sandbox)
                 sandbox["foo"](val)
                 self.assertEqual(out.getvalue(), msg)
 
@@ -119,7 +118,7 @@ def get_result(
 
         status = 0
         try:
-            exec_(command, sandbox)
+            exec(command, sandbox)
             sandbox.run()
         except SystemExit as e:
             status = e.code

python/mozbuild/mozbuild/test/configure/test_compile_checks.py

@@ -13,7 +13,6 @@
 from test_toolchain_helpers import FakeCompiler
 
 from common import ConfigureTestSandbox
-from mozbuild.util import exec_
 
 
 class BaseCompileChecks(unittest.TestCase):
@@ -132,12 +131,12 @@ def host_cxx_compiler():
         sandbox = ConfigureTestSandbox(paths, config, {}, ["/bin/configure"], out, out)
         sandbox.include_file(os.path.join(base_dir, "util.configure"))
         sandbox.include_file(os.path.join(base_dir, "checks.configure"))
-        exec_(mock_compiler_defs, sandbox)
+        exec(mock_compiler_defs, sandbox)
         sandbox.include_file(os.path.join(base_dir, "compile-checks.configure"))
 
         status = 0
         try:
-            exec_(command, sandbox)
+            exec(command, sandbox)
             sandbox.run()
         except SystemExit as e:
             status = e.code

python/mozbuild/mozbuild/test/configure/test_configure.py

@@ -18,7 +18,7 @@
     NegativeOptionValue,
     PositiveOptionValue,
 )
-from mozbuild.util import ReadOnlyNamespace, exec_, memoized_property
+from mozbuild.util import ReadOnlyNamespace, memoized_property
 
 test_data_path = mozpath.abspath(mozpath.dirname(__file__))
 test_data_path = mozpath.join(test_data_path, "data")
@@ -296,7 +296,7 @@ def test_imports(self):
         sandbox = ConfigureSandbox(config, {}, ["configure"], out, out)
 
         with self.assertRaises(ImportError):
-            exec_(
+            exec(
                 textwrap.dedent(
                     """
                 @template
@@ -307,7 +307,7 @@ def foo():
                 sandbox,
             )
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -322,11 +322,11 @@ def foo():
 
         # os.path after an import is a mix of vanilla os.path and sandbox os.path.
         os_path = {}
-        exec_("from os.path import *", {}, os_path)
+        exec("from os.path import *", {}, os_path)
         os_path.update(sandbox.OS.path.__dict__)
         os_path = ReadOnlyNamespace(**os_path)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -339,7 +339,7 @@ def foo():
 
         self.assertEqual(sandbox["foo"](), os_path)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -352,7 +352,7 @@ def foo():
 
         self.assertEqual(sandbox["foo"](), os_path)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -367,7 +367,7 @@ def foo():
             sandbox["foo"]()
         self.assertEqual(str(e.exception), "Importing __builtin__ is forbidden")
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -384,7 +384,7 @@ def foo():
         f.close()
 
         # This used to unlock the sandbox
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -400,7 +400,7 @@ def foo():
             sandbox["foo"]()
         self.assertEqual(str(e.exception), "Importing __builtin__ is forbidden")
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -413,7 +413,7 @@ def foo():
 
         self.assertIs(sandbox["foo"](), sandbox)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -430,7 +430,7 @@ def foo():
         self.assertEqual(list(sandbox), ["__builtins__", "foo"])
         self.assertEqual(sandbox["__builtins__"], ConfigureSandbox.BUILTINS)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -462,7 +462,7 @@ def _apply_imports(self, *args, **kwargs):
         out = StringIO()
         sandbox = CountApplyImportsSandbox(config, {}, ["configure"], out, out)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template
@@ -490,7 +490,7 @@ def _wrapped_foo(self):
         out = StringIO()
         sandbox = BasicWrappingSandbox(config, {}, ["configure"], out, out)
 
-        exec_(
+        exec(
             textwrap.dedent(
                 """
             @template

python/mozbuild/mozbuild/test/configure/test_moz_configure.py

@@ -5,15 +5,15 @@
 from mozunit import main
 
 from common import BaseConfigureTest, ConfigureTestSandbox
-from mozbuild.util import ReadOnlyNamespace, exec_, memoized_property
+from mozbuild.util import ReadOnlyNamespace, memoized_property
 
 
 def sandbox_class(platform):
     class ConfigureTestSandboxOverridingPlatform(ConfigureTestSandbox):
         @memoized_property
         def _wrapped_sys(self):
             sys = {}
-            exec_("from sys import *", sys)
+            exec("from sys import *", sys)
             sys["platform"] = platform
             return ReadOnlyNamespace(**sys)
 

python/mozbuild/mozbuild/test/configure/test_util.py

@@ -23,7 +23,6 @@
     Version,
     getpreferredencoding,
 )
-from mozbuild.util import exec_
 
 
 class TestConfigureOutputHandler(unittest.TestCase):
@@ -457,7 +456,7 @@ def get_result(self, command="", paths=None):
         )
         status = 0
         try:
-            exec_(command, sandbox)
+            exec(command, sandbox)
             sandbox.run()
         except SystemExit as e:
             status = e.code

python/mozbuild/mozbuild/util.py

@@ -40,22 +40,6 @@
     system_encoding = "utf-8"
 
 
-def exec_(object, globals=None, locals=None):
-    """Wrapper around the exec statement to avoid bogus errors like:
-
-    SyntaxError: unqualified exec is not allowed in function ...
-    it is a nested function.
-
-    or
-
-    SyntaxError: unqualified exec is not allowed in function ...
-    it contains a nested function with free variable
-
-    which happen with older versions of python 2.7.
-    """
-    exec(object, globals, locals)
-
-
 def _open(path, mode):
     if "b" in mode:
         return io.open(path, mode)