diff --git a/lib/logitech/unifying_receiver/base.py b/lib/logitech/unifying_receiver/base.py index bbca1f0b..3a50881f 100644 --- a/lib/logitech/unifying_receiver/base.py +++ b/lib/logitech/unifying_receiver/base.py @@ -109,7 +109,7 @@ def close(handle): """Closes a HID device handle.""" if handle: try: - if type(handle) == int: + if isinstance(handle, int): _hid.close(handle) else: handle.close() diff --git a/lib/logitech/unifying_receiver/common.py b/lib/logitech/unifying_receiver/common.py index 692722d0..af6c0837 100644 --- a/lib/logitech/unifying_receiver/common.py +++ b/lib/logitech/unifying_receiver/common.py @@ -120,7 +120,7 @@ class NamedInts(object): if isinstance(index, int): if index in self._indexed: return self._indexed[int(index)] - if self._fallback and type(index) == int: + if self._fallback and isinstance(index, int): value = NamedInt(index, self._fallback(index)) self._indexed[index] = value self._values = sorted(self._values + [value]) diff --git a/lib/logitech/unifying_receiver/listener.py b/lib/logitech/unifying_receiver/listener.py index dc8f9a1f..50408b24 100644 --- a/lib/logitech/unifying_receiver/listener.py +++ b/lib/logitech/unifying_receiver/listener.py @@ -35,7 +35,7 @@ class _ThreadedHandle(object): assert listener is not None assert path is not None assert handle is not None - assert type(handle) == int + assert isinstance(handle, int) self._listener = listener self.path = path diff --git a/lib/logitech/unifying_receiver/receiver.py b/lib/logitech/unifying_receiver/receiver.py index eb537fbc..0b512643 100644 --- a/lib/logitech/unifying_receiver/receiver.py +++ b/lib/logitech/unifying_receiver/receiver.py @@ -321,7 +321,7 @@ class Receiver(object): self.name = 'Nano Receiver' else: raise Exception("unknown receiver type", self.max_devices) - self._str = '<%s(%s,%s%s)>' % (self.name.replace(' ', ''), self.path, '' if type(self.handle) == int else 'T', self.handle) + self._str = '<%s(%s,%s%s)>' % (self.name.replace(' ', ''), self.path, '' if isinstance(self.handle, int) else 'T', self.handle) # TODO _properly_ figure out which receivers do and which don't support unpairing self.may_unpair = self.write_register(_R.receiver_pairing) is None @@ -429,7 +429,7 @@ class Receiver(object): if dev is not None: return dev - if type(key) != int: + if not isinstance(key, int): raise TypeError('key must be an integer') if key < 1 or key > self.max_devices: raise IndexError(key) @@ -457,7 +457,7 @@ class Receiver(object): return len([d for d in self._devices.values() if d is not None]) def __contains__(self, dev): - if type(dev) == int: + if isinstance(dev, int): return self._devices.get(dev) is not None return self.__contains__(dev.number)