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

Remove more Python 2 compatibility code

Browse source 
- os.environ is always `str` in Python 3.
- The only string type is `str` so we can stop using `six.str_types`.
- `iteritems()` isn't necessary because dicts have the `items()` method.
This commit is contained in:
Martin Robinson 2023-05-29 13:56:03 +02:00
parent 9a93c21867
commit faa8c0e967
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
4 changed files with 8 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/testing_commands.py
View file

@ -20,7 +20,6 @@ import time
import shutil
import subprocess
from xml.etree.ElementTree import XML
from six import iteritems
import wpt
import wpt.manifestupdate
@ -62,7 +61,7 @@ TEST_SUITES = OrderedDict([
"include_arg": "test_name"}),
])
TEST_SUITES_BY_PREFIX = {path: k for k, v in iteritems(TEST_SUITES) if "paths" in v for path in v["paths"]}
TEST_SUITES_BY_PREFIX = {path: k for k, v in TEST_SUITES.items() if "paths" in v for path in v["paths"]}
@CommandProvider
@ -133,7 +132,7 @@ class MachCommands(CommandBase):
return 1
test_start = time.time()
for suite, tests in iteritems(selected_suites):
for suite, tests in selected_suites.items():
props = suites[suite]
kwargs = props.get("kwargs", {})
if tests:
@ -149,7 +148,7 @@ class MachCommands(CommandBase):
def suite_for_path(self, path_arg):
if os.path.exists(path.abspath(path_arg)):
abs_path = path.abspath(path_arg)
for prefix, suite in iteritems(TEST_SUITES_BY_PREFIX):
for prefix, suite in TEST_SUITES_BY_PREFIX.items():
if abs_path.startswith(prefix):
return suite
return None