summaryrefslogtreecommitdiff
path: root/coverage/backward.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2013-09-28 09:39:50 -0400
committerNed Batchelder <ned@nedbatchelder.com>2013-09-28 09:39:50 -0400
commitebc42980c8dd2d88bd80252330678b4b4ea8d86b (patch)
treedeeb9ce391c2eec334a8691149f37f2cf0195588 /coverage/backward.py
parentc36e091f44d4fa82cdcde671c0123cd9dac0b784 (diff)
downloadpython-coveragepy-git-ebc42980c8dd2d88bd80252330678b4b4ea8d86b.tar.gz
Make iteritems detection more like the rest of backward.py, and add a test of it.
Diffstat (limited to 'coverage/backward.py')
-rw-r--r--coverage/backward.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/coverage/backward.py b/coverage/backward.py
index 54e46254..4894bac0 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -75,14 +75,16 @@ except NameError:
range = range
# A function to iterate listlessly over a dict's items.
-if "iteritems" in dir({}):
+try:
+ {}.iteritems
+except AttributeError:
def iitems(d):
"""Produce the items from dict `d`."""
- return d.iteritems()
+ return d.items()
else:
def iitems(d):
"""Produce the items from dict `d`."""
- return d.items()
+ return d.iteritems()
# Exec is a statement in Py2, a function in Py3
if sys.version_info >= (3, 0):