From 55e7f6976897e8a23ffbdb158b977396c655d3f9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 16 Feb 2021 13:48:02 +0530 Subject: [PATCH] Use importlib.resources to enumerate kitten names --- kittens/runner.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kittens/runner.py b/kittens/runner.py index c420b14f4..2e149d655 100644 --- a/kittens/runner.py +++ b/kittens/runner.py @@ -123,14 +123,12 @@ def run_kitten(kitten: str, run_name: str = '__main__') -> None: @run_once def all_kitten_names() -> FrozenSet[str]: - n = [] - import glob - base = os.path.dirname(os.path.abspath(__file__)) - for x in glob.glob(os.path.join(base, '*', '__init__.py')): - q = os.path.basename(os.path.dirname(x)) - if q != 'tui': - n.append(q) - return frozenset(n) + from importlib.resources import contents + ans = [] + for name in contents('kittens'): + if '__' not in name and name != 'tui': + ans.append(name) + return frozenset(ans) def list_kittens() -> None: