From 62cc4dbb14c5d07069c108ba38e219db9ae370b7 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Fri, 27 Dec 2024 00:08:08 -0600 Subject: [PATCH] scripts: Disabled local import hack on import Moved local import hack behind if __name__ == "__main__" These scripts aren't really intended to be used as python libraries. Still, it's useful to import them for debugging and to get access to their juicy internals. --- scripts/bench.py | 3 ++- scripts/changeprefix.py | 3 ++- scripts/code.py | 3 ++- scripts/cov.py | 3 ++- scripts/crc32c.py | 3 ++- scripts/csv.py | 3 ++- scripts/ctx.py | 3 ++- scripts/data.py | 3 ++- scripts/dbgblock.py | 3 ++- scripts/dbgbmap.py | 3 ++- scripts/dbgbtree.py | 3 ++- scripts/dbgcat.py | 3 ++- scripts/dbgerr.py | 3 ++- scripts/dbglfs.py | 3 ++- scripts/dbgmtree.py | 3 ++- scripts/dbgrbyd.py | 3 ++- scripts/dbgtag.py | 3 ++- scripts/parity.py | 3 ++- scripts/perf.py | 3 ++- scripts/perfbd.py | 3 ++- scripts/plot.py | 3 ++- scripts/plotmpl.py | 3 ++- scripts/prettyasserts.py | 3 ++- scripts/readblock.py | 3 ++- scripts/stack.py | 3 ++- scripts/structs.py | 3 ++- scripts/tailpipe.py | 3 ++- scripts/teepipe.py | 3 ++- scripts/test.py | 3 ++- scripts/tracebd.py | 3 ++- scripts/watch.py | 3 ++- 31 files changed, 62 insertions(+), 31 deletions(-) diff --git a/scripts/bench.py b/scripts/bench.py index 4da66294..130ed4ba 100755 --- a/scripts/bench.py +++ b/scripts/bench.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/changeprefix.py b/scripts/changeprefix.py index e2e4bfe9..2034274d 100755 --- a/scripts/changeprefix.py +++ b/scripts/changeprefix.py @@ -12,7 +12,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import glob import itertools diff --git a/scripts/code.py b/scripts/code.py index ad9c281f..1631f9b4 100755 --- a/scripts/code.py +++ b/scripts/code.py @@ -13,7 +13,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/cov.py b/scripts/cov.py index 027e7913..1fcebf87 100755 --- a/scripts/cov.py +++ b/scripts/cov.py @@ -13,7 +13,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/crc32c.py b/scripts/crc32c.py index f4b47233..07dde8fd 100755 --- a/scripts/crc32c.py +++ b/scripts/crc32c.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import io import os diff --git a/scripts/csv.py b/scripts/csv.py index f4e3a06c..8b26310b 100755 --- a/scripts/csv.py +++ b/scripts/csv.py @@ -11,7 +11,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/ctx.py b/scripts/ctx.py index b2d471c4..02e9e8a2 100755 --- a/scripts/ctx.py +++ b/scripts/ctx.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/data.py b/scripts/data.py index ef5a95de..9a2bfa0f 100755 --- a/scripts/data.py +++ b/scripts/data.py @@ -13,7 +13,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/dbgblock.py b/scripts/dbgblock.py index 24804202..fd10083f 100755 --- a/scripts/dbgblock.py +++ b/scripts/dbgblock.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import os diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py index e71fa8b6..9d84d56d 100755 --- a/scripts/dbgbmap.py +++ b/scripts/dbgbmap.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/dbgbtree.py b/scripts/dbgbtree.py index 1eb45d13..53598f8c 100755 --- a/scripts/dbgbtree.py +++ b/scripts/dbgbtree.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/dbgcat.py b/scripts/dbgcat.py index f17d0140..d6252b05 100755 --- a/scripts/dbgcat.py +++ b/scripts/dbgcat.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import os diff --git a/scripts/dbgerr.py b/scripts/dbgerr.py index 7a630e93..1ee89dcc 100755 --- a/scripts/dbgerr.py +++ b/scripts/dbgerr.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) ERRS = [ diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py index a7759b94..79e2aa32 100755 --- a/scripts/dbglfs.py +++ b/scripts/dbglfs.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py index 141b0a21..4e489c4f 100755 --- a/scripts/dbgmtree.py +++ b/scripts/dbgmtree.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py index 9053e51d..a5256636 100755 --- a/scripts/dbgrbyd.py +++ b/scripts/dbgrbyd.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/dbgtag.py b/scripts/dbgtag.py index ec39ca7d..f172301b 100755 --- a/scripts/dbgtag.py +++ b/scripts/dbgtag.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import io import os diff --git a/scripts/parity.py b/scripts/parity.py index 904ed8dc..a4f56406 100755 --- a/scripts/parity.py +++ b/scripts/parity.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import io import os diff --git a/scripts/perf.py b/scripts/perf.py index 4d2ec758..f343ca4f 100755 --- a/scripts/perf.py +++ b/scripts/perf.py @@ -11,7 +11,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/perfbd.py b/scripts/perfbd.py index c6f20407..46e04aa2 100755 --- a/scripts/perfbd.py +++ b/scripts/perfbd.py @@ -12,7 +12,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import collections as co diff --git a/scripts/plot.py b/scripts/plot.py index 3e4ea6c3..28e90efd 100755 --- a/scripts/plot.py +++ b/scripts/plot.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import bisect import codecs diff --git a/scripts/plotmpl.py b/scripts/plotmpl.py index ae434851..ce76d302 100755 --- a/scripts/plotmpl.py +++ b/scripts/plotmpl.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import codecs import collections as co diff --git a/scripts/prettyasserts.py b/scripts/prettyasserts.py index dca5c2ef..4df3ec6d 100755 --- a/scripts/prettyasserts.py +++ b/scripts/prettyasserts.py @@ -11,7 +11,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import io import re diff --git a/scripts/readblock.py b/scripts/readblock.py index d7fec741..e107f8fd 100755 --- a/scripts/readblock.py +++ b/scripts/readblock.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import subprocess as sp diff --git a/scripts/stack.py b/scripts/stack.py index bfe63a04..7a7560df 100755 --- a/scripts/stack.py +++ b/scripts/stack.py @@ -11,7 +11,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/structs.py b/scripts/structs.py index 15c7c434..c36b3d2f 100755 --- a/scripts/structs.py +++ b/scripts/structs.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/tailpipe.py b/scripts/tailpipe.py index 4ff92b6f..e2a85379 100755 --- a/scripts/tailpipe.py +++ b/scripts/tailpipe.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import io diff --git a/scripts/teepipe.py b/scripts/teepipe.py index e37e8748..743b281a 100755 --- a/scripts/teepipe.py +++ b/scripts/teepipe.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import os import io diff --git a/scripts/test.py b/scripts/test.py index 207d06fb..70025e24 100755 --- a/scripts/test.py +++ b/scripts/test.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import csv diff --git a/scripts/tracebd.py b/scripts/tracebd.py index 239f98f4..1db70fee 100755 --- a/scripts/tracebd.py +++ b/scripts/tracebd.py @@ -10,7 +10,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import functools as ft diff --git a/scripts/watch.py b/scripts/watch.py index 837ec384..90a77cc7 100755 --- a/scripts/watch.py +++ b/scripts/watch.py @@ -11,7 +11,8 @@ # # prevent local imports -__import__('sys').path.pop(0) +if __name__ == "__main__": + __import__('sys').path.pop(0) import collections as co import errno