Mercurial > public > mercurial-scm > hg-stable
diff mercurial/copies.py @ 36379:f62369667a7c
py3: use list comprehensions instead of filter where we need to eagerly filter
These two uses of filter() are then checked for truthiness, but on Python 3:
>>> bool(filter(None, []))
True
So we need to stop depending on that. Fortunately it's easy to replace
the filter with an equivalent list comprehension.
Differential Revision: https://phab.mercurial-scm.org/D2364
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 21 Feb 2018 10:10:02 -0500 |
| parents | c02771617a70 |
| children | a4f02a17420d |
line wrap: on
line diff
--- a/mercurial/copies.py Wed Feb 21 10:08:35 2018 -0500 +++ b/mercurial/copies.py Wed Feb 21 10:10:02 2018 -0500 @@ -685,8 +685,8 @@ # the base and present in the source. # Presence in the base is important to exclude added files, presence in the # source is important to exclude removed files. - missingfiles = filter(lambda f: f not in m1 and f in base and f in c2, - changedfiles) + filt = lambda f: f not in m1 and f in base and f in c2 + missingfiles = [f for f in changedfiles if filt(f)] if missingfiles: basenametofilename = collections.defaultdict(list)