--- a/mercurial/merge.py	Fri Jun 30 23:58:59 2017 -0700
+++ b/mercurial/merge.py	Tue Dec 01 09:26:10 2015 -0800
@@ -444,7 +444,7 @@
     def unresolved(self):
         """Obtain the paths of unresolved files."""
 
-        for f, entry in self._state.items():
+        for f, entry in self._state.iteritems():
             if entry[0] == 'u':
                 yield f