From 9cecc1b535a7601be382bd61e5346cac0382092e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Feb 2018 09:38:53 +1000 Subject: [PATCH] Replace @property with @GObject.property Let's stick to just one for consistency --- tuhi/base.py | 6 +++--- tuhi/ble.py | 10 +++++----- tuhi/config.py | 2 +- tuhi/drawing.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tuhi/base.py b/tuhi/base.py index 72c9520..7441ad0 100644 --- a/tuhi/base.py +++ b/tuhi/base.py @@ -78,15 +78,15 @@ class TuhiDevice(GObject.Object): def paired(self, paired): self._paired = paired - @property + @GObject.Property def name(self): return self._bluez_device.name - @property + @GObject.Property def address(self): return self._bluez_device.address - @property + @GObject.Property def dbus_device(self): return self._tuhi_dbus_device diff --git a/tuhi/ble.py b/tuhi/ble.py index f4ba6ce..24ba0e4 100755 --- a/tuhi/ble.py +++ b/tuhi/ble.py @@ -118,29 +118,29 @@ class BlueZDevice(GObject.Object): if self.connected: self.emit('connected') - @property + @GObject.property def name(self): try: return self.interface.get_cached_property('Name').unpack() except AttributeError: return 'UNKNOWN' - @property + @GObject.property def address(self): return self.interface.get_cached_property('Address').unpack() - @property + @GObject.property def uuids(self): return self.interface.get_cached_property('UUIDs').unpack() - @property + @GObject.property def vendor_id(self): md = self.interface.get_cached_property('ManufacturerData') if md is not None: return md.keys()[0] return None - @property + @GObject.property def connected(self): return (self.interface.get_cached_property('Connected').unpack() and self.interface.get_cached_property('ServicesResolved').unpack()) diff --git a/tuhi/config.py b/tuhi/config.py index 0c37477..3290b9e 100644 --- a/tuhi/config.py +++ b/tuhi/config.py @@ -40,7 +40,7 @@ class TuhiConfig(GObject.Object): self._devices = {} self._scan_config_dir() - @property + @GObject.property def devices(self): ''' Returns a dictionary with the bluetooth address as key diff --git a/tuhi/drawing.py b/tuhi/drawing.py index 10a7aa4..8fe44bb 100644 --- a/tuhi/drawing.py +++ b/tuhi/drawing.py @@ -88,7 +88,7 @@ class Drawing(GObject.Object): # The way we're building drawings, we don't need to change the current # stroke at runtime, so this is read-ony - @property + @GObject.property def current_stroke(self): return self.strokes[self._current_stroke]