Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use iteritems from six module for Python3 compatibility

Browse source
This commit is contained in:
marmeladema 2019-10-14 00:54:37 +01:00
parent 6c813d073c
commit 5bd0fca140
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/testing_commands.py
View file

@ -22,6 +22,7 @@ import six.moves.urllib as urllib
import base64 import base64
import shutil import shutil
import subprocess import subprocess
from six import iteritems
from mach.registrar import Registrar from mach.registrar import Registrar
from mach.decorators import ( from mach.decorators import (
@ -59,7 +60,7 @@ TEST_SUITES = OrderedDict([
"include_arg": "test_name"}), "include_arg": "test_name"}),
]) ])
TEST_SUITES_BY_PREFIX = {path: k for k, v in TEST_SUITES.iteritems() if "paths" in v for path in v["paths"]} TEST_SUITES_BY_PREFIX = {path: k for k, v in iteritems(TEST_SUITES) if "paths" in v for path in v["paths"]}
def create_parser_wpt(): def create_parser_wpt():
@ -158,7 +159,7 @@ class MachCommands(CommandBase):
return 1 return 1
test_start = time.time() test_start = time.time()
for suite, tests in selected_suites.iteritems(): for suite, tests in iteritems(selected_suites):
props = suites[suite] props = suites[suite]
kwargs = props.get("kwargs", {}) kwargs = props.get("kwargs", {})
if tests: if tests:
@ -174,7 +175,7 @@ class MachCommands(CommandBase):
def suite_for_path(self, path_arg): def suite_for_path(self, path_arg):
if os.path.exists(path.abspath(path_arg)): if os.path.exists(path.abspath(path_arg)):
abs_path = path.abspath(path_arg) abs_path = path.abspath(path_arg)
for prefix, suite in TEST_SUITES_BY_PREFIX.iteritems(): for prefix, suite in iteritems(TEST_SUITES_BY_PREFIX):
if abs_path.startswith(prefix): if abs_path.startswith(prefix):
return suite return suite
return None return None

5
python/tidy/servo_tidy/tidy.py
View file

@ -25,6 +25,7 @@ import toml
import voluptuous import voluptuous
import yaml import yaml
from licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml from licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml
from six import iteritems
topdir = os.path.abspath(os.path.dirname(sys.argv[0])) topdir = os.path.abspath(os.path.dirname(sys.argv[0]))
wpt = os.path.join(topdir, "tests", "wpt") wpt = os.path.join(topdir, "tests", "wpt")
@ -380,7 +381,7 @@ def check_lock(file_name, contents):
if name not in packages_by_name: if name not in packages_by_name:
yield (1, "duplicates are allowed for `{}` but it is not a dependency".format(name)) yield (1, "duplicates are allowed for `{}` but it is not a dependency".format(name))
for (name, packages) in packages_by_name.iteritems(): for (name, packages) in iteritems(packages_by_name):
has_duplicates = len(packages) > 1 has_duplicates = len(packages) > 1
duplicates_allowed = name in exceptions duplicates_allowed = name in exceptions
@ -424,7 +425,7 @@ def check_lock(file_name, contents):
visited_whitelisted_packages[dependency_name][package_name] = True visited_whitelisted_packages[dependency_name][package_name] = True
# Check if all the exceptions to blocked packages actually depend on the blocked package # Check if all the exceptions to blocked packages actually depend on the blocked package
for dependency_name, package_names in blocked_packages.iteritems(): for dependency_name, package_names in iteritems(blocked_packages):
for package_name in package_names: for package_name in package_names:
if not visited_whitelisted_packages[dependency_name].get(package_name): if not visited_whitelisted_packages[dependency_name].get(package_name):
fmt = "Package {} is not required to be an exception of blocked package {}." fmt = "Package {} is not required to be an exception of blocked package {}."