1616string_types ,
1717force_bytes ,
1818defenc ,
19- mviter ,
2019)
2120from git .exc import (
2221GitCommandError ,
@@ -442,7 +441,7 @@ def iter_blobs(self, predicate=lambda t: True):
442441 Function(t) returning True if tuple(stage, Blob) should be yielded by the
443442 iterator. A default filter, the BlobFilter, allows you to yield blobs
444443 only if they match a given list of paths. """
445- for entry in mviter ( self .entries ):
444+ for entry in self .entries . values ( ):
446445blob = entry .to_blob (self .repo )
447446blob .size = entry .size
448447output = (entry .stage ,blob )
@@ -467,7 +466,7 @@ def unmerged_blobs(self):
467466for stage ,blob in self .iter_blobs (is_unmerged_blob ):
468467path_map .setdefault (blob .path , []).append ((stage ,blob ))
469468# END for each unmerged blob
470- for l in mviter ( path_map ):
469+ for l in path_map . values ( ):
471470l .sort ()
472471return path_map
473472
@@ -1086,7 +1085,7 @@ def handle_stderr(proc, iter_checked_out_files):
10861085proc = self .repo .git .checkout_index (* args ,** kwargs )
10871086proc .wait ()
10881087fprogress (None ,True ,None )
1089- rval_iter = (e .path for e in mviter ( self .entries ))
1088+ rval_iter = (e .path for e in self .entries . values ( ))
10901089handle_stderr (proc ,rval_iter )
10911090return rval_iter
10921091else :
@@ -1117,7 +1116,7 @@ def handle_stderr(proc, iter_checked_out_files):
11171116folder = co_path
11181117if not folder .endswith ('/' ):
11191118folder += '/'
1120- for entry in mviter ( self .entries ):
1119+ for entry in self .entries . values ( ):
11211120if entry .path .startswith (folder ):
11221121p = entry .path
11231122self ._write_path_to_stdin (proc ,p ,p ,make_exc ,