From 639459347abe82f7798202ec81161442c7fe9221 Mon Sep 17 00:00:00 2001 From: mrmcwethy Date: Sun, 1 Oct 2017 12:55:45 -0700 Subject: [PATCH 1/2] changed import ustruct to struct --- adafruit_rgb_display/ili9341.py | 8 ++++++-- adafruit_rgb_display/rgb.py | 13 ++++++++----- adafruit_rgb_display/st7735.py | 9 ++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/adafruit_rgb_display/ili9341.py b/adafruit_rgb_display/ili9341.py index f03ddaa..75e7c2e 100644 --- a/adafruit_rgb_display/ili9341.py +++ b/adafruit_rgb_display/ili9341.py @@ -1,4 +1,8 @@ -import ustruct +try: + import struct +except: + import ustruct as struct + from adafruit_rgb_display.rgb import DisplaySPI @@ -60,4 +64,4 @@ def scroll(self, dy=None): if dy is None: return self._scroll self._scroll = (self._scroll + dy) % self.height - self._write(0x37, ustruct.pack('>H', self._scroll)) + self._write(0x37, struct.pack('>H', self._scroll)) diff --git a/adafruit_rgb_display/rgb.py b/adafruit_rgb_display/rgb.py index 04f0f2c..a463d9f 100644 --- a/adafruit_rgb_display/rgb.py +++ b/adafruit_rgb_display/rgb.py @@ -1,5 +1,8 @@ import time -import ustruct +try: + import struct +except: + import ustruct as struct import adafruit_bus_device.spi_device as spi_device @@ -45,22 +48,22 @@ def _block(self, x0, y0, x1, y1, data=None): self._write(self._COLUMN_SET, self._encode_pos(x0, x1)) self._write(self._PAGE_SET, self._encode_pos(y0, y1)) if data is None: - size = ustruct.calcsize(self._DECODE_PIXEL) + size = struct.calcsize(self._DECODE_PIXEL) return self._read(self._RAM_READ, (x1 - x0 + 1) * (y1 - y0 + 1) * size) self._write(self._RAM_WRITE, data) def _encode_pos(self, a, b): """Encode a postion into bytes.""" - return ustruct.pack(self._ENCODE_POS, a, b) + return struct.pack(self._ENCODE_POS, a, b) def _encode_pixel(self, color): """Encode a pixel color into bytes.""" - return ustruct.pack(self._ENCODE_PIXEL, color) + return struct.pack(self._ENCODE_PIXEL, color) def _decode_pixel(self, data): """Decode bytes into a pixel color.""" - return color565(*ustruct.unpack(self._DECODE_PIXEL, data)) + return color565(*struct.unpack(self._DECODE_PIXEL, data)) def pixel(self, x, y, color=None): """Read or write a pixel.""" diff --git a/adafruit_rgb_display/st7735.py b/adafruit_rgb_display/st7735.py index 57fa2f5..d60880c 100644 --- a/adafruit_rgb_display/st7735.py +++ b/adafruit_rgb_display/st7735.py @@ -1,5 +1,8 @@ from adafruit_rgb_display.rgb import DisplaySPI -import ustruct +try: + import struct +except: + import ustruct as struct _NOP=const(0x00) @@ -132,8 +135,8 @@ def __init__(self, spi, dc, cs, rst=None, width=128, height=160): def init(self): super().init() - cols = ustruct.pack('>HH', 0, self.width - 1) - rows = ustruct.pack('>HH', 0, self.height - 1) + cols = struct.pack('>HH', 0, self.width - 1) + rows = struct.pack('>HH', 0, self.height - 1) for command, data in ( (_CASET, cols), (_RASET, rows), From 1c29e17d3fab0d62536af8308496f0463a298560 Mon Sep 17 00:00:00 2001 From: mrmcwethy Date: Tue, 3 Oct 2017 07:33:19 -0700 Subject: [PATCH 2/2] added ImportError to except --- adafruit_rgb_display/ili9341.py | 2 +- adafruit_rgb_display/rgb.py | 2 +- adafruit_rgb_display/st7735.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_rgb_display/ili9341.py b/adafruit_rgb_display/ili9341.py index 75e7c2e..31b76b6 100644 --- a/adafruit_rgb_display/ili9341.py +++ b/adafruit_rgb_display/ili9341.py @@ -1,6 +1,6 @@ try: import struct -except: +except ImportError: import ustruct as struct from adafruit_rgb_display.rgb import DisplaySPI diff --git a/adafruit_rgb_display/rgb.py b/adafruit_rgb_display/rgb.py index a463d9f..01f9f26 100644 --- a/adafruit_rgb_display/rgb.py +++ b/adafruit_rgb_display/rgb.py @@ -1,7 +1,7 @@ import time try: import struct -except: +except ImportError: import ustruct as struct import adafruit_bus_device.spi_device as spi_device diff --git a/adafruit_rgb_display/st7735.py b/adafruit_rgb_display/st7735.py index d60880c..748bed3 100644 --- a/adafruit_rgb_display/st7735.py +++ b/adafruit_rgb_display/st7735.py @@ -1,7 +1,7 @@ from adafruit_rgb_display.rgb import DisplaySPI try: import struct -except: +except ImportError: import ustruct as struct