--- a/mercurial/dirstate.py	Thu Jan 18 13:12:09 2018 -0500
+++ b/mercurial/dirstate.py	Thu Feb 01 16:01:43 2018 -0500
@@ -1237,9 +1237,12 @@
         util.clearcachedproperty(self, "nonnormalset")
         util.clearcachedproperty(self, "otherparentset")
 
-    def iteritems(self):
+    def items(self):
         return self._map.iteritems()
 
+    # forward for python2,3 compat
+    iteritems = items
+
     def __len__(self):
         return len(self._map)