diff --git a/scripts/code.py b/scripts/code.py index 6415015e..8c071b69 100755 --- a/scripts/code.py +++ b/scripts/code.py @@ -603,7 +603,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/cov.py b/scripts/cov.py index 56a39541..9bc35c84 100755 --- a/scripts/cov.py +++ b/scripts/cov.py @@ -463,7 +463,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/crc32c.py b/scripts/crc32c.py index 5ae309f1..6693117f 100755 --- a/scripts/crc32c.py +++ b/scripts/crc32c.py @@ -41,7 +41,8 @@ def crc32c(data, crc=0): def main(paths, *, hex=False, string=False): - hex_ = hex; del hex + import builtins + hex_, hex = hex, builtins.hex # interpret as sequence of hex bytes if hex_: diff --git a/scripts/csv.py b/scripts/csv.py index 29c0364b..dee8f2aa 100755 --- a/scripts/csv.py +++ b/scripts/csv.py @@ -1735,7 +1735,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/ctx.py b/scripts/ctx.py index 16af2b9d..0f3f3318 100755 --- a/scripts/ctx.py +++ b/scripts/ctx.py @@ -863,7 +863,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/data.py b/scripts/data.py index f3471071..3c9a9316 100755 --- a/scripts/data.py +++ b/scripts/data.py @@ -603,7 +603,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py index c18a4571..1a7962db 100755 --- a/scripts/dbgbmap.py +++ b/scripts/dbgbmap.py @@ -2964,7 +2964,8 @@ class Lfs: # lookup operations def lookup(self, mid, mdir=None, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # is this mid grmed? if not all_ and self.grmed(mid): @@ -2985,7 +2986,8 @@ class Lfs: def namelookup(self, did, name, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all mid_, mdir_, name_ = self.mtree.namelookup(did, name) if mid_ is None: @@ -3047,7 +3049,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory if path_ is None: @@ -3100,7 +3103,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory did = did or self.root.did @@ -3155,7 +3159,8 @@ class Lfs: def orphans(self, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # first find all reachable dids dids = {self.root.did} diff --git a/scripts/dbgbmapd3.py b/scripts/dbgbmapd3.py index ae91cfdf..854258f3 100755 --- a/scripts/dbgbmapd3.py +++ b/scripts/dbgbmapd3.py @@ -2994,7 +2994,8 @@ class Lfs: # lookup operations def lookup(self, mid, mdir=None, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # is this mid grmed? if not all_ and self.grmed(mid): @@ -3015,7 +3016,8 @@ class Lfs: def namelookup(self, did, name, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all mid_, mdir_, name_ = self.mtree.namelookup(did, name) if mid_ is None: @@ -3077,7 +3079,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory if path_ is None: @@ -3130,7 +3133,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory did = did or self.root.did @@ -3185,7 +3189,8 @@ class Lfs: def orphans(self, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # first find all reachable dids dids = {self.root.did} diff --git a/scripts/dbgerr.py b/scripts/dbgerr.py index 6195f612..67e355bd 100755 --- a/scripts/dbgerr.py +++ b/scripts/dbgerr.py @@ -28,7 +28,8 @@ ERRS = [ def main(errs, *, list=False): - list_ = list; del list + import builtins + list_, list = list, builtins.list lines = [] # list all known error codes diff --git a/scripts/dbgflags.py b/scripts/dbgflags.py index c6641b58..4868954b 100755 --- a/scripts/dbgflags.py +++ b/scripts/dbgflags.py @@ -205,8 +205,9 @@ FLAGS = [ def main(flags, *, list=False, all=False): - list_ = list; del list - all_ = all; del all + import builtins + list_, list = list, builtins.list + all_, all = all, builtins.all # first compile prefixes prefixes = {} diff --git a/scripts/dbgle32.py b/scripts/dbgle32.py index 4ceacd31..920c4139 100755 --- a/scripts/dbgle32.py +++ b/scripts/dbgle32.py @@ -59,7 +59,8 @@ def main(le32s, *, hex=False, input=None, word_bits=32): - hex_ = hex; del hex + import builtins + hex_, hex = hex, builtins.hex # interpret as a sequence of hex bytes if hex_: diff --git a/scripts/dbgleb128.py b/scripts/dbgleb128.py index 6652830b..df8d7aaa 100755 --- a/scripts/dbgleb128.py +++ b/scripts/dbgleb128.py @@ -71,7 +71,8 @@ def main(leb128s, *, hex=False, input=None, word_bits=32): - hex_ = hex; del hex + import builtins + hex_, hex = hex, builtins.hex # interpret as a sequence of hex bytes if hex_: diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py index c8c58320..3cbd0513 100755 --- a/scripts/dbglfs.py +++ b/scripts/dbglfs.py @@ -2921,7 +2921,8 @@ class Lfs: # lookup operations def lookup(self, mid, mdir=None, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # is this mid grmed? if not all_ and self.grmed(mid): @@ -2942,7 +2943,8 @@ class Lfs: def namelookup(self, did, name, *, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all mid_, mdir_, name_ = self.mtree.namelookup(did, name) if mid_ is None: @@ -3004,7 +3006,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory if path_ is None: @@ -3057,7 +3060,8 @@ class Lfs: all=False, path=False, depth=None): - all_ = all; del all + import builtins + all_, all = all, builtins.all # default to the root directory did = did or self.root.did @@ -3112,7 +3116,8 @@ class Lfs: def orphans(self, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # first find all reachable dids dids = {self.root.did} @@ -4142,7 +4147,8 @@ def dbg_files(lfs, paths, *, all=False, no_orphans=False, **args): - all_ = all; del all + import builtins + all_, all = all, builtins.all # parse all paths first, error if anything is malformed dirs = [] diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py index 4c295989..905b0eeb 100755 --- a/scripts/dbgrbyd.py +++ b/scripts/dbgrbyd.py @@ -948,7 +948,8 @@ class JumpArt: @classmethod def fromrbyd(cls, rbyd, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all jumps = [] j_ = 4 @@ -1100,7 +1101,8 @@ class LifetimeArt: @classmethod def fromrbyd(cls, rbyd, all=False): - all_ = all; del all + import builtins + all_, all = all, builtins.all # first figure out where each rid comes from id = 0 diff --git a/scripts/dbgtag.py b/scripts/dbgtag.py index 36953d46..cd8402e5 100755 --- a/scripts/dbgtag.py +++ b/scripts/dbgtag.py @@ -290,8 +290,9 @@ def main(tags, *, hex=False, input=None, word_bits=32): - list_ = list; del list - hex_ = hex; del hex + import builtins + list_, list = list, builtins.list + hex_, hex = hex, builtins.hex # list all known tags if list_: diff --git a/scripts/parity.py b/scripts/parity.py index 78fd0702..a204231e 100755 --- a/scripts/parity.py +++ b/scripts/parity.py @@ -49,7 +49,8 @@ def parity(x): def main(paths, *, hex=False, string=False): - hex_ = hex; del hex + import builtins + hex_, hex = hex, builtins.hex # interpret as sequence of hex bytes if hex_: diff --git a/scripts/perf.py b/scripts/perf.py index c0f2c888..51b14316 100755 --- a/scripts/perf.py +++ b/scripts/perf.py @@ -964,7 +964,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/perfbd.py b/scripts/perfbd.py index f6ee35d4..745934b5 100755 --- a/scripts/perfbd.py +++ b/scripts/perfbd.py @@ -938,7 +938,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/stack.py b/scripts/stack.py index b7e03c36..42615423 100755 --- a/scripts/stack.py +++ b/scripts/stack.py @@ -606,7 +606,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by diff --git a/scripts/structs.py b/scripts/structs.py index 3ceec243..926a1092 100755 --- a/scripts/structs.py +++ b/scripts/structs.py @@ -744,7 +744,8 @@ def table(Result, results, diff_results=None, *, small_table=False, summary=False, **_): - all_ = all; del all + import builtins + all_, all = all, builtins.all if by is None: by = Result._by