From 600c443c92d57a648f779b0569357b2f7b9529e3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 22 Dec 2021 09:59:09 -0500 Subject: [PATCH] Remove obsolete references to ustruct --- adafruit_rgb_display/ili9341.py | 6 +----- adafruit_rgb_display/rgb.py | 5 +---- adafruit_rgb_display/st7735.py | 5 +---- adafruit_rgb_display/st7789.py | 6 ++---- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/adafruit_rgb_display/ili9341.py b/adafruit_rgb_display/ili9341.py index d2d78aa..b29b3f2 100644 --- a/adafruit_rgb_display/ili9341.py +++ b/adafruit_rgb_display/ili9341.py @@ -10,11 +10,7 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ - -try: - import struct -except ImportError: - import ustruct as struct +import struct from adafruit_rgb_display.rgb import DisplaySPI diff --git a/adafruit_rgb_display/rgb.py b/adafruit_rgb_display/rgb.py index 50e9e63..8d92fb8 100644 --- a/adafruit_rgb_display/rgb.py +++ b/adafruit_rgb_display/rgb.py @@ -11,16 +11,13 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ +import struct import time try: import numpy except ImportError: numpy = None -try: - import struct -except ImportError: - import ustruct as struct from adafruit_bus_device import spi_device diff --git a/adafruit_rgb_display/st7735.py b/adafruit_rgb_display/st7735.py index f3070d5..b1686bb 100644 --- a/adafruit_rgb_display/st7735.py +++ b/adafruit_rgb_display/st7735.py @@ -10,11 +10,8 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ +import struct -try: - import struct -except ImportError: - import ustruct as struct from micropython import const from adafruit_rgb_display.rgb import DisplaySPI diff --git a/adafruit_rgb_display/st7789.py b/adafruit_rgb_display/st7789.py index 8eca18d..05133d1 100644 --- a/adafruit_rgb_display/st7789.py +++ b/adafruit_rgb_display/st7789.py @@ -11,10 +11,8 @@ * Author(s): Melissa LeBlanc-Williams """ -try: - import struct -except ImportError: - import ustruct as struct +import struct + from micropython import const from adafruit_rgb_display.rgb import DisplaySPI