Remove and replace compat.mviter

git/compat.py

@@ -33,9 +33,6 @@
 defenc = sys.getfilesystemencoding()
 
 if PY3:
-    def mviter(d):
-        return d.values()
-
     range = xrange  # @ReservedAssignment
     unicode = str
     binary_type = bytes
@@ -46,9 +43,6 @@ def mviter(d):
     binary_type = str
     range = xrange  # @ReservedAssignment
 
-    def mviter(d):
-        return d.itervalues()
-
 
 def safe_decode(s):
     """Safely decodes a binary string to unicode"""

git/index/base.py

@@ -16,7 +16,6 @@
     string_types,
     force_bytes,
     defenc,
-    mviter,
 )
 from git.exc import (
     GitCommandError,
@@ -442,7 +441,7 @@ def iter_blobs(self, predicate=lambda t: True):
             Function(t) returning True if tuple(stage, Blob) should be yielded by the
             iterator. A default filter, the BlobFilter, allows you to yield blobs
             only if they match a given list of paths. """
-        for entry in mviter(self.entries):
+        for entry in self.entries.values():
             blob = entry.to_blob(self.repo)
             blob.size = entry.size
             output = (entry.stage, blob)
@@ -467,7 +466,7 @@ def unmerged_blobs(self):
         for stage, blob in self.iter_blobs(is_unmerged_blob):
             path_map.setdefault(blob.path, []).append((stage, blob))
         # END for each unmerged blob
-        for l in mviter(path_map):
+        for l in path_map.values():
             l.sort()
         return path_map
 
@@ -1086,7 +1085,7 @@ def handle_stderr(proc, iter_checked_out_files):
             proc = self.repo.git.checkout_index(*args, **kwargs)
             proc.wait()
             fprogress(None, True, None)
-            rval_iter = (e.path for e in mviter(self.entries))
+            rval_iter = (e.path for e in self.entries.values())
             handle_stderr(proc, rval_iter)
             return rval_iter
         else:
@@ -1117,7 +1116,7 @@ def handle_stderr(proc, iter_checked_out_files):
                     folder = co_path
                     if not folder.endswith('/'):
                         folder += '/'
-                    for entry in mviter(self.entries):
+                    for entry in self.entries.values():
                         if entry.path.startswith(folder):
                             p = entry.path
                             self._write_path_to_stdin(proc, p, p, make_exc,