From e5cc601482ff1cfe602a776d924f36c582f2af5c Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 18 Feb 2025 21:31:51 +0100 Subject: [PATCH] import rich, except ImportError s --- tools/assets/extract/extase/memorymap.py | 2 +- tools/assets/extract/extase_oot64/dlist_resources.py | 2 +- tools/assets/extract/extract_xml_z64.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/assets/extract/extase/memorymap.py b/tools/assets/extract/extase/memorymap.py index 0e519f60ed..0064357bfe 100644 --- a/tools/assets/extract/extase/memorymap.py +++ b/tools/assets/extract/extase/memorymap.py @@ -8,7 +8,7 @@ from typing import Callable, TypeVar, Generic try: from rich.pretty import pprint as rich_pprint -except ModuleNotFoundError: +except ImportError: rich_pprint = print from . import Resource, File, GetResourceAtResult diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py index 8ba856d90b..c7ead26cbe 100644 --- a/tools/assets/extract/extase_oot64/dlist_resources.py +++ b/tools/assets/extract/extase_oot64/dlist_resources.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Union, Optional, Callable try: from rich.pretty import pprint as rich_pprint -except ModuleNotFoundError: +except ImportError: rich_pprint = print import pygfxd diff --git a/tools/assets/extract/extract_xml_z64.py b/tools/assets/extract/extract_xml_z64.py index 3d6369a6c4..1d8d8ae31a 100644 --- a/tools/assets/extract/extract_xml_z64.py +++ b/tools/assets/extract/extract_xml_z64.py @@ -108,7 +108,7 @@ def process_pool( import rich rich.print(f"[b]{colls_str}[/b]") - except: + except ImportError: print(colls_str) file_by_rescoll: dict[ResourcesDescCollection, File] = dict() @@ -488,7 +488,7 @@ def main(): try: import rich.pretty import rich.console - except: + except ImportError: traceback.print_exc(file=sys.stdout) print("Install rich for prettier output (`pip install rich`)") else: