aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy
diff options
context:
space:
mode:
authormarmeladema <xademax@gmail.com>2019-10-14 00:54:37 +0100
committermarmeladema <xademax@gmail.com>2019-10-16 00:22:08 +0100
commit5bd0fca1405f1c7748d255dd0ba65ce7ba133c0a (patch)
tree93d905ace25a34889fccc58ebfc49e568ac104df /python/tidy/servo_tidy
parent6c813d073ca4099cf2207dae02a7a1594b8d2be1 (diff)
downloadservo-5bd0fca1405f1c7748d255dd0ba65ce7ba133c0a.tar.gz
servo-5bd0fca1405f1c7748d255dd0ba65ce7ba133c0a.zip
Use iteritems from six module for Python3 compatibility
Diffstat (limited to 'python/tidy/servo_tidy')
-rw-r--r--python/tidy/servo_tidy/tidy.py5
1 files changed, 3 insertions, 2 deletions
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 {}."