diff options
Diffstat (limited to 'glucometerutils/support')
-rw-r--r-- | glucometerutils/support/freestyle.py | 5 | ||||
-rw-r--r-- | glucometerutils/support/hiddevice.py | 10 | ||||
-rw-r--r-- | glucometerutils/support/lifescan.py | 12 | ||||
-rw-r--r-- | glucometerutils/support/lifescan_binary_protocol.py | 20 | ||||
-rw-r--r-- | glucometerutils/support/serial.py | 4 |
5 files changed, 26 insertions, 25 deletions
diff --git a/glucometerutils/support/freestyle.py b/glucometerutils/support/freestyle.py index 5822d18..2206821 100644 --- a/glucometerutils/support/freestyle.py +++ b/glucometerutils/support/freestyle.py @@ -18,7 +18,7 @@ import re try: from typing import Iterator, List, Text, Tuple -except: +except ImportError: pass import construct @@ -110,8 +110,7 @@ class FreeStyleHidDevice(hiddevice.HidDevice): usb_packet = _FREESTYLE_MESSAGE.build( {'message_type': message_type, 'command': command}) - logging.debug('Sending packet: %r', usb_packet -) + logging.debug('Sending packet: %r', usb_packet) self._write(usb_packet) def _read_response(self): diff --git a/glucometerutils/support/hiddevice.py b/glucometerutils/support/hiddevice.py index 1c5b58d..12debf8 100644 --- a/glucometerutils/support/hiddevice.py +++ b/glucometerutils/support/hiddevice.py @@ -11,13 +11,13 @@ import os try: from typing import BinaryIO, Optional, Text -except: +except ImportError: pass from glucometerutils import exceptions -class HidDevice(object): +class HidDevice: """A device speaking USB HID protocol driver base. This class does not implement an actual driver by itself, but provides an @@ -100,6 +100,6 @@ class HidDevice(object): """ if self.handle_: return bytes(self.handle_.read(size)) - else: - return bytes(self.hidapi_handle_.read( - size, timeout_ms=self.TIMEOUT_MS)) + + return bytes(self.hidapi_handle_.read( + size, timeout_ms=self.TIMEOUT_MS)) diff --git a/glucometerutils/support/lifescan.py b/glucometerutils/support/lifescan.py index 13529ec..1b5cb2d 100644 --- a/glucometerutils/support/lifescan.py +++ b/glucometerutils/support/lifescan.py @@ -12,19 +12,21 @@ from glucometerutils import exceptions class MissingChecksum(exceptions.InvalidResponse): """The response misses the expected 4-digits checksum.""" def __init__(self, response): - self.message = 'Response is missing checksum: %s' % response + super(MissingChecksum, self).__init__( + 'Response is missing checksum: %s' % response) class InvalidSerialNumber(exceptions.Error): """The serial number is not as expected.""" def __init__(self, serial_number): - self.message = 'Serial number %s is invalid.' % serial_number + super(InvalidSerialNumber, self).__init__( + 'Serial number %s is invalid.' % serial_number) class MalformedCommand(exceptions.InvalidResponse): def __init__(self, message): - exceptions.InvalidResponse.__init__( - self, 'Malformed command: %s' % message) + super(MalformedCommand, self).__init__( + 'Malformed command: %s' % message) def crc_ccitt(data): @@ -49,4 +51,4 @@ def crc_ccitt(data): crc ^= (((crc << 8) & 0xffff) << 4) & 0xffff crc ^= (crc & 0xff) << 5 - return (crc & 0xffff) + return crc & 0xffff diff --git a/glucometerutils/support/lifescan_binary_protocol.py b/glucometerutils/support/lifescan_binary_protocol.py index 8b37726..e08d39f 100644 --- a/glucometerutils/support/lifescan_binary_protocol.py +++ b/glucometerutils/support/lifescan_binary_protocol.py @@ -27,7 +27,7 @@ _LINK_CONTROL = construct.BitStruct( 'sequence_number' / construct.Default(construct.Flag, False), ) -def LifeScanPacket(include_link_control): +def LifeScanPacket(include_link_control): # pylint: disable=invalid-name # type: (bool) -> construct.Struct if include_link_control: link_control_construct = _LINK_CONTROL @@ -36,15 +36,15 @@ def LifeScanPacket(include_link_control): return construct.Struct( 'data' / construct.RawCopy( - construct.Struct( - construct.Const(b'\x02'), # stx - 'length' / construct.Rebuild( - construct.Byte, lambda this: len(this.message) + 6), - 'link_control' / link_control_construct, - 'message' / construct.Bytes( - lambda this: this.length - 6), - construct.Const(b'\x03'), # etx - ), + construct.Struct( + construct.Const(b'\x02'), # stx + 'length' / construct.Rebuild( + construct.Byte, lambda this: len(this.message) + 6), + 'link_control' / link_control_construct, + 'message' / construct.Bytes( + lambda this: this.length - 6), + construct.Const(b'\x03'), # etx + ), ), 'checksum' / construct.Checksum( construct.Int16ul, lifescan.crc_ccitt, construct.this.data.data), diff --git a/glucometerutils/support/serial.py b/glucometerutils/support/serial.py index c46d819..8dfe297 100644 --- a/glucometerutils/support/serial.py +++ b/glucometerutils/support/serial.py @@ -11,7 +11,7 @@ import logging try: from typing import Optional, Text -except: +except ImportError: pass import serial @@ -19,7 +19,7 @@ import serial from glucometerutils import exceptions -class SerialDevice(object): +class SerialDevice: """A Serial-connected glucometer driver base. This class does not implement an actual driver by itself, but provides an |