forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python 2/3 compatible treatment of max(n, None)

Browse source 
Python 3 does no longer allow comparisons of different types. Therefore,
explicitly convert f.checked_runid to a number that's always smaller than
`f.changed_runid`
This commit is contained in:
Moritz Lell 2019-10-30 19:51:17 +01:00
commit efab08fc9f
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
redo/deps.py
View file

@ -95,7 +95,7 @@ def isdirty(f, depth, max_changed,
elif mode == 'm': elif mode == 'm':
sub = isdirty(f2, depth=depth + ' ', sub = isdirty(f2, depth=depth + ' ',
max_changed=max(f.changed_runid, max_changed=max(f.changed_runid,
f.checked_runid), f.checked_runid or 0),
already_checked=already_checked, already_checked=already_checked,
is_checked=is_checked, is_checked=is_checked,
set_checked=set_checked, set_checked=set_checked,

3
redo/state.py
View file

@ -278,7 +278,8 @@ class File(object):
(self.id, self.name, self.is_generated, self.is_override, (self.id, self.name, self.is_generated, self.is_override,
self.checked_runid, self.changed_runid, self.failed_runid, self.checked_runid, self.changed_runid, self.failed_runid,
self.stamp, self.csum) = cols self.stamp, self.csum) = cols
if self.name == ALWAYS and self.changed_runid < env.v.RUNID: if self.name == ALWAYS and (
self.changed_runid is None or self.changed_runid < env.v.RUNID):
self.changed_runid = env.v.RUNID self.changed_runid = env.v.RUNID
def __init__(self, fid=None, name=None, cols=None, allow_add=True): def __init__(self, fid=None, name=None, cols=None, allow_add=True):