Remove use of six.iteritems (#28875)
diff --git a/docs/wpt_lint_rules.py b/docs/wpt_lint_rules.py
index b999737..01f965e 100644
--- a/docs/wpt_lint_rules.py
+++ b/docs/wpt_lint_rules.py
@@ -3,7 +3,6 @@
from recommonmark.parser import CommonMarkParser
import importlib
import textwrap
-from six import iteritems
class WPTLintRules(Directive):
"""A docutils directive to generate documentation for the
@@ -32,7 +31,7 @@
"""wpt-lint-rules: unable to resolve the module at "{}".""".format(self.module_specifier)
)
- for binding_name, value in iteritems(module.__dict__):
+ for binding_name, value in module.__dict__.items():
if hasattr(value, "__abstractmethods__") and len(value.__abstractmethods__):
continue
diff --git a/webdriver/tests/support/helpers.py b/webdriver/tests/support/helpers.py
index 13607e3..1d25d38 100644
--- a/webdriver/tests/support/helpers.py
+++ b/webdriver/tests/support/helpers.py
@@ -4,8 +4,6 @@
import math
import sys
-from six import iteritems
-
import webdriver
from tests.support import defaults
@@ -114,7 +112,7 @@
Update a nested dictionary or similar mapping.
Modify ``source`` in place.
"""
- for key, value in iteritems(overrides):
+ for key, value in overrides.items():
if isinstance(value, collections.Mapping) and value:
returned = deep_update(source.get(key, {}), value)
source[key] = returned
diff --git a/webdriver/tests/support/merge_dictionaries.py b/webdriver/tests/support/merge_dictionaries.py
index c13ab90..72f1cab 100644
--- a/webdriver/tests/support/merge_dictionaries.py
+++ b/webdriver/tests/support/merge_dictionaries.py
@@ -1,5 +1,3 @@
-from six import iteritems
-
def merge_dictionaries(first, second):
"""Given two dictionaries, create a third that defines all specified
key/value pairs. This merge_dictionaries is performed "deeply" on any nested
@@ -7,7 +5,7 @@
an exception will be raised."""
result = dict(first)
- for key, value in iteritems(second):
+ for key, value in second.items():
if key in result and result[key] != value:
if isinstance(result[key], dict) and isinstance(value, dict):
result[key] = merge_dictionaries(result[key], value)
