Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace call to execfile(...) by call to exec(compile(open(...)))

Browse source 
This is done in order to be compatible with Python3
This commit is contained in:
marmeladema 2019-10-20 19:34:25 +01:00
parent 882dcc8408
commit 865d7377b3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/mach_bootstrap.py
View file

@ -166,7 +166,7 @@ def _activate_virtualenv(topdir, is_firefox):
# We want to upgrade pip when virtualenv created for the first time # We want to upgrade pip when virtualenv created for the first time
need_pip_upgrade = True 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) python = _get_exec_path(PYTHON_NAMES, is_valid_path=check_exec_path)
if not python: if not python:

10
python/servo/testing_commands.py
View file

@ -350,7 +350,7 @@ class MachCommands(CommandBase):
run_file = path.abspath(path.join(test_file_dir, "runtests.py")) run_file = path.abspath(path.join(test_file_dir, "runtests.py"))
run_globals = {"__file__": run_file} run_globals = {"__file__": run_file}
execfile(run_file, run_globals) exec(compile(open(run_file).read(), run_file, 'exec'), run_globals)
verbose = not quiet verbose = not quiet
return run_globals["run_tests"](tests, verbose) return run_globals["run_tests"](tests, verbose)
@ -442,7 +442,7 @@ class MachCommands(CommandBase):
kwargs["binary_args"] = binary_args kwargs["binary_args"] = binary_args
run_globals = {"__file__": run_file} 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) return run_globals["run_tests"](**kwargs)
@Command('update-manifest', @Command('update-manifest',
@ -473,7 +473,7 @@ class MachCommands(CommandBase):
return 1 return 1
run_globals = {"__file__": run_file} 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) return run_globals["update_tests"](**kwargs)
@Command('filter-intermittents', @Command('filter-intermittents',
@ -913,7 +913,7 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
"components", "net", "tests", "components", "net", "tests",
"cookie_http_state_utils.py")) "cookie_http_state_utils.py"))
run_globals = {"__file__": run_file} 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) return run_globals["update_test_file"](cache_dir)
@Command('update-webgl', @Command('update-webgl',
@ -934,7 +934,7 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
shutil.rmtree(dest_folder) shutil.rmtree(dest_folder)
run_globals = {"__file__": run_file} 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) return run_globals["update_conformance"](version, dest_folder, None, patches_dir)
@Command('smoketest', @Command('smoketest',