Make iteritems detection more like the rest of backward.py, and add a test of it.

1 files changed, 5 insertions, 3 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index 54e4625..4894bac 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):