diff options
| author | marmeladema <xademax@gmail.com> | 2019-10-20 19:34:25 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2019-10-20 23:43:25 +0100 |
| commit | 865d7377b30c43c98072a6883a50f98d97e2b45a (patch) | |
| tree | 631e510a5745a51bb2ec8318e8d5ebaa6a3caa87 /python | |
| parent | 882dcc8408159bed5633337d11e83b6839f97e34 (diff) | |
| download | servo-865d7377b30c43c98072a6883a50f98d97e2b45a.tar.gz servo-865d7377b30c43c98072a6883a50f98d97e2b45a.zip | |
Replace call to execfile(...) by call to exec(compile(open(...)))
This is done in order to be compatible with Python3
Diffstat (limited to 'python')
| -rw-r--r-- | python/mach_bootstrap.py | 2 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index f94f2c6f772..ec506c881a6 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -166,7 +166,7 @@ def _activate_virtualenv(topdir, is_firefox): # We want to upgrade pip when virtualenv created for the first time need_pip_upgrade = True - execfile(activate_path, dict(__file__=activate_path)) + exec(compile(open(activate_path).read(), activate_path, 'exec'), dict(__file__=activate_path)) python = _get_exec_path(PYTHON_NAMES, is_valid_path=check_exec_path) if not python: diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 1f7651f814b..79b73ccc6e5 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -350,7 +350,7 @@ class MachCommands(CommandBase): run_file = path.abspath(path.join(test_file_dir, "runtests.py")) run_globals = {"__file__": run_file} - execfile(run_file, run_globals) + exec(compile(open(run_file).read(), run_file, 'exec'), run_globals) verbose = not quiet return run_globals["run_tests"](tests, verbose) @@ -442,7 +442,7 @@ class MachCommands(CommandBase): kwargs["binary_args"] = binary_args run_globals = {"__file__": run_file} - execfile(run_file, run_globals) + exec(compile(open(run_file).read(), run_file, 'exec'), run_globals) return run_globals["run_tests"](**kwargs) @Command('update-manifest', @@ -473,7 +473,7 @@ class MachCommands(CommandBase): return 1 run_globals = {"__file__": run_file} - execfile(run_file, run_globals) + exec(compile(open(run_file).read(), run_file, 'exec'), run_globals) return run_globals["update_tests"](**kwargs) @Command('filter-intermittents', @@ -913,7 +913,7 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path) "components", "net", "tests", "cookie_http_state_utils.py")) run_globals = {"__file__": run_file} - execfile(run_file, run_globals) + exec(compile(open(run_file).read(), run_file, 'exec'), run_globals) return run_globals["update_test_file"](cache_dir) @Command('update-webgl', @@ -934,7 +934,7 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path) shutil.rmtree(dest_folder) run_globals = {"__file__": run_file} - execfile(run_file, run_globals) + exec(compile(open(run_file).read(), run_file, 'exec'), run_globals) return run_globals["update_conformance"](version, dest_folder, None, patches_dir) @Command('smoketest', |