diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/testing_commands.py | 7 | ||||
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index a80b89cfb11..1f7651f814b 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -22,6 +22,7 @@ import six.moves.urllib as urllib import base64 import shutil import subprocess +from six import iteritems from mach.registrar import Registrar from mach.decorators import ( @@ -59,7 +60,7 @@ TEST_SUITES = OrderedDict([ "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(): @@ -158,7 +159,7 @@ class MachCommands(CommandBase): return 1 test_start = time.time() - for suite, tests in selected_suites.iteritems(): + for suite, tests in iteritems(selected_suites): props = suites[suite] kwargs = props.get("kwargs", {}) if tests: @@ -174,7 +175,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 TEST_SUITES_BY_PREFIX.iteritems(): + for prefix, suite in iteritems(TEST_SUITES_BY_PREFIX): if abs_path.startswith(prefix): return suite return None diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index efd3648b2ab..f7fa296790d 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -25,6 +25,7 @@ import toml import voluptuous import yaml 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])) wpt = os.path.join(topdir, "tests", "wpt") @@ -380,7 +381,7 @@ def check_lock(file_name, contents): if name not in packages_by_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 duplicates_allowed = name in exceptions @@ -424,7 +425,7 @@ def check_lock(file_name, contents): visited_whitelisted_packages[dependency_name][package_name] = True # 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: if not visited_whitelisted_packages[dependency_name].get(package_name): fmt = "Package {} is not required to be an exception of blocked package {}." |