KevinMidboe/python-gpiozero
1
0
Fork 0
mirror of https://github.com/KevinMidboe/python-gpiozero.git synced 2025-10-29 17:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reference Device directly

Browse Source 
Don't go via the instance dict (prevents anyone overriding the
reservations dict or pin_factory at the instance level)
This commit is contained in:
Dave Jones
2017-06-16 22:12:16 +01:00
parent 6017e7d01d
commit aa3aa21695
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gpiozero/devices.py
View File

@@ -224,7 +224,7 @@ class Device(ValuesMixin, GPIOBase):
p.address if isinstance(p, Pin) else p p.address if isinstance(p, Pin) else p
for p in pins_or_addresses for p in pins_or_addresses
) )
with self._res_lock: with Device._res_lock:
for address in addresses: for address in addresses:
for device_ref in Device._reservations[address]: for device_ref in Device._reservations[address]:
device = device_ref() device = device_ref()
@@ -247,10 +247,10 @@ class Device(ValuesMixin, GPIOBase):
p.address if isinstance(p, Pin) else p p.address if isinstance(p, Pin) else p
for p in pins_or_addresses for p in pins_or_addresses
) )
with self._res_lock: with Device._res_lock:
for address in addresses: for address in addresses:
Device._reservations[address] = [ Device._reservations[address] = [
ref for ref in self._reservations[address] ref for ref in Device._reservations[address]
if ref() not in (self, None) # may as well clean up dead refs if ref() not in (self, None) # may as well clean up dead refs
] ]
@@ -259,13 +259,13 @@ class Device(ValuesMixin, GPIOBase):
Releases all pin reservations taken out by this device. See Releases all pin reservations taken out by this device. See
:meth:`_release_pins` for further information). :meth:`_release_pins` for further information).
""" """
with self._res_lock: with Device._res_lock:
Device._reservations = defaultdict(list, { Device._reservations = defaultdict(list, {
address: [ address: [
ref for ref in conflictors ref for ref in conflictors
if ref() not in (self, None) if ref() not in (self, None)
] ]
for address, conflictors in self._reservations.items() for address, conflictors in Device._reservations.items()
}) })
def _conflicts_with(self, other): def _conflicts_with(self, other):
@@ -424,8 +424,8 @@ class GPIODevice(Device):
self._reserve_pins(pin) self._reserve_pins(pin)
else: else:
# Check you can reserve *before* constructing the pin # Check you can reserve *before* constructing the pin
self._reserve_pins(self._pin_factory.pin_address(pin)) self._reserve_pins(Device._pin_factory.pin_address(pin))
pin = self._pin_factory.pin(pin) pin = Device._pin_factory.pin(pin)
self._pin = pin self._pin = pin
self._active_state = True self._active_state = True
self._inactive_state = False self._inactive_state = False