Skip to content

Commit db4cb7c

Browse files
Harmon758Byron
authored andcommitted
Remove and replace compat.mviter
1 parent bdfd3fc commit db4cb7c

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

git/compat.py

-6
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
defenc = sys.getfilesystemencoding()
3434

3535
if PY3:
36-
def mviter(d):
37-
return d.values()
38-
3936
range = xrange # @ReservedAssignment
4037
unicode = str
4138
binary_type = bytes
@@ -46,9 +43,6 @@ def mviter(d):
4643
binary_type = str
4744
range = xrange # @ReservedAssignment
4845

49-
def mviter(d):
50-
return d.itervalues()
51-
5246

5347
def safe_decode(s):
5448
"""Safely decodes a binary string to unicode"""

git/index/base.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
string_types,
1717
force_bytes,
1818
defenc,
19-
mviter,
2019
)
2120
from git.exc import (
2221
GitCommandError,
@@ -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():
446445
blob = entry.to_blob(self.repo)
447446
blob.size = entry.size
448447
output = (entry.stage, blob)
@@ -467,7 +466,7 @@ def unmerged_blobs(self):
467466
for stage, blob in self.iter_blobs(is_unmerged_blob):
468467
path_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():
471470
l.sort()
472471
return path_map
473472

@@ -1086,7 +1085,7 @@ def handle_stderr(proc, iter_checked_out_files):
10861085
proc = self.repo.git.checkout_index(*args, **kwargs)
10871086
proc.wait()
10881087
fprogress(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())
10901089
handle_stderr(proc, rval_iter)
10911090
return rval_iter
10921091
else:
@@ -1117,7 +1116,7 @@ def handle_stderr(proc, iter_checked_out_files):
11171116
folder = co_path
11181117
if not folder.endswith('/'):
11191118
folder += '/'
1120-
for entry in mviter(self.entries):
1119+
for entry in self.entries.values():
11211120
if entry.path.startswith(folder):
11221121
p = entry.path
11231122
self._write_path_to_stdin(proc, p, p, make_exc,

0 commit comments

Comments
 (0)