--- a/mercurial/manifest.py	Sun May 28 15:51:07 2017 -0400
+++ b/mercurial/manifest.py	Mon May 29 00:00:02 2017 -0400
@@ -579,9 +579,11 @@
         c._lm = self._lm.copy()
         return c
 
-    def iteritems(self):
+    def items(self):
         return (x[:2] for x in self._lm.iterentries())
 
+    iteritems = items
+
     def iterentries(self):
         return self._lm.iterentries()
 
@@ -788,7 +790,7 @@
                 for x in n.iterentries():
                     yield x
 
-    def iteritems(self):
+    def items(self):
         self._load()
         for p, n in sorted(itertools.chain(self._dirs.items(),
                                            self._files.items())):
@@ -798,6 +800,8 @@
                 for f, sn in n.iteritems():
                     yield f, sn
 
+    iteritems = items
+
     def iterkeys(self):
         self._load()
         for p in sorted(itertools.chain(self._dirs, self._files)):