From abb6c35650dda17e5e6e92062f8f7767e92dccdc Mon Sep 17 00:00:00 2001 From: Randall Bohn Date: Fri, 26 Nov 2021 08:13:43 -0700 Subject: [PATCH 1/3] Handle ImportError in widgets __init__.py If bitmaptools is not available an ImportError is raised. --- adafruit_displayio_layout/widgets/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_displayio_layout/widgets/__init__.py b/adafruit_displayio_layout/widgets/__init__.py index ed1bae9..e1e8282 100644 --- a/adafruit_displayio_layout/widgets/__init__.py +++ b/adafruit_displayio_layout/widgets/__init__.py @@ -11,7 +11,7 @@ try: import bitmaptools -except NameError: +except ImportError: pass From c0115d60f683a69782d32ffac2258ebf658b9c5d Mon Sep 17 00:00:00 2001 From: Randall Bohn Date: Fri, 26 Nov 2021 08:15:33 -0700 Subject: [PATCH 2/3] Handle missing bitmaptools in cartesian.py --- adafruit_displayio_layout/widgets/cartesian.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/adafruit_displayio_layout/widgets/cartesian.py b/adafruit_displayio_layout/widgets/cartesian.py index fa678c6..601e0da 100644 --- a/adafruit_displayio_layout/widgets/cartesian.py +++ b/adafruit_displayio_layout/widgets/cartesian.py @@ -33,9 +33,6 @@ try: import bitmaptools -except NameError: - pass -try: from typing import Tuple except ImportError: pass From 3626da3adb3758e174bd4b80ae79e237650f8ac5 Mon Sep 17 00:00:00 2001 From: Randall Bohn Date: Fri, 26 Nov 2021 08:41:50 -0700 Subject: [PATCH 3/3] Try imports in separate blocks As @foamyguy pointed out, you may have one or the other library, both or none. This handles the combinations properly. --- adafruit_displayio_layout/widgets/cartesian.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adafruit_displayio_layout/widgets/cartesian.py b/adafruit_displayio_layout/widgets/cartesian.py index 601e0da..c914cd9 100644 --- a/adafruit_displayio_layout/widgets/cartesian.py +++ b/adafruit_displayio_layout/widgets/cartesian.py @@ -33,6 +33,10 @@ try: import bitmaptools +except ImportError: + pass + +try: from typing import Tuple except ImportError: pass