Merge 4b398d4 into 64301ba

seanbudd · web-flow · commit 72ce6ecf1ffe · 2022-05-12T09:39:22.000+10:00
diff --git a/source/braille.py b/source/braille.py
@@ -2427,13 +2427,13 @@ def terminate(self):
 		Subclasses should call the superclass method first.
 		@postcondition: This instance can no longer be used unless it is constructed again.
 		"""
-		super(BrailleDisplayDriver,self).terminate()
+		super().terminate()
 		# Clear the display.
 		try:
 			self.display([0] * self.numCells)
-		except:
+		except Exception as e:
 			# The display driver seems to be failing, but we're terminating anyway, so just ignore it.
-			pass
+			log.debugWarning(f"Display driver {self} is failing while terminating. {e}")
 
 	#: typing information for autoproperty _get_numCells
 	numCells: int
diff --git a/source/brailleDisplayDrivers/seikantk.py b/source/brailleDisplayDrivers/seikantk.py
@@ -9,7 +9,7 @@
 import re
 from io import BytesIO
 import typing
-from typing import Dict, List, Set
+from typing import Dict, List, Optional, Set
 
 import serial
 
@@ -97,7 +97,7 @@ def isSeikaBluetoothDeviceMatch(match: DeviceMatch) -> bool:
 
 
 class BrailleDisplayDriver(braille.BrailleDisplayDriver):
-	_dev: hwIo.IoBase
+	_dev: Optional[hwIo.IoBase] = None
 	name = SEIKA_NAME
 	# Translators: Name of a braille display.
 	description = _("Seika Notetaker")
@@ -185,12 +185,18 @@ def _getDeviceInfo(self, dev: hwIo.IoBase) -> bool:
 		return False
 
 	def terminate(self):
+		if self._dev is None:
+			log.error("Seika Notetaker driver not initialized")
+			return
 		try:
 			super().terminate()
 		finally:
 			self._dev.close()
 
 	def display(self, cells: List[int]):
+		if self._dev is None:
+			log.error("Seika Notetaker driver not initialized")
+			return
 		# cells will already be padded up to numCells.
 		cellBytes = SEIKA_SEND_TEXT + bytes([self.numCells]) + bytes(cells)
 		self._dev.write(cellBytes)
