nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wacom: replace the last exception with a protocol exception 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-08-22 08:36:14 +10:00 committed by Benjamin Tissoires
parent be38e1a781
commit ebf48be0ad
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tuhi/wacom.py
View File

@ -18,7 +18,6 @@ import logging
import threading import threading
import time import time
import uuid import uuid
import errno
from pathlib import Path from pathlib import Path
from gi.repository import GObject from gi.repository import GObject
from .drawing import Drawing from .drawing import Drawing
@ -246,10 +245,6 @@ class DataLogger(object):
self.logfile.write(f' source: {source}\n') self.logfile.write(f' source: {source}\n')
class WacomException(Exception):
errno = errno.ENOSYS
class WacomPacket(GObject.Object): class WacomPacket(GObject.Object):
''' '''
A single protocol packet of variable length. The protocol format is a A single protocol packet of variable length. The protocol format is a
@ -421,7 +416,7 @@ class WacomRegisterHelper(WacomProtocolLowLevelComm):
protocol_version = self.p.execute(Interactions.REGISTER_WAIT_FOR_BUTTON).protocol_version protocol_version = self.p.execute(Interactions.REGISTER_WAIT_FOR_BUTTON).protocol_version
if protocol_version == ProtocolVersion.ANY: if protocol_version == ProtocolVersion.ANY:
raise WacomException(f'Unknown protocol version: {protocol_version}') raise tuhi.protocol.ProtocolError(f'Unknown protocol version: {protocol_version}')
return protocol_version return protocol_version
@ -1020,7 +1015,7 @@ class WacomDevice(GObject.Object):
self.sync_state = 1 self.sync_state = 1
self._wacom_protocol.retrieve_data() self._wacom_protocol.retrieve_data()
self.sync_state = 0 self.sync_state = 0
except WacomException as e: except DeviceError as e:
logger.error(f'**** Exception: {e} ****') logger.error(f'**** Exception: {e} ****')
exception = e exception = e
self.sync_state = 0 self.sync_state = 0