KevinMidboe/python-gpiozero
1
0
Fork 0
mirror of https://github.com/KevinMidboe/python-gpiozero.git synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move device construction into dict-comprehension

Browse Source 
Shouldn't make any difference to object lifetimes, but makes the
constructor similar to all others (which don't seem to have the same
issue?)
This commit is contained in:
Dave Jones
2017-06-25 21:35:58 +01:00
parent 12cbd5ae09
commit 53a8200507
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gpiozero/boards.py
View File

@@ -834,11 +834,10 @@ class StatusZero(LEDBoard):
dup, count = Counter(labels).most_common(1)[0] dup, count = Counter(labels).most_common(1)[0]
if count > 1: if count > 1:
raise ValueError("Duplicate label %s" % dup) raise ValueError("Duplicate label %s" % dup)
strips = OrderedDict() super(StatusZero, self).__init__(_order=labels, **{
for (green, red), label in zip(pins, labels): label: LEDBoard(red=red, green=green, _order=('red', 'green'), **kwargs)
strips[label] = LEDBoard(red=red, green=green, for (green, red), label in zip(pins, labels)
_order=('red', 'green'), **kwargs) })
super(StatusZero, self).__init__(_order=strips.keys(), **strips)
class StatusBoard(CompositeOutputDevice): class StatusBoard(CompositeOutputDevice):
@@ -882,14 +881,14 @@ class StatusBoard(CompositeOutputDevice):
dup, count = Counter(labels).most_common(1)[0] dup, count = Counter(labels).most_common(1)[0]
if count > 1: if count > 1:
raise ValueError("Duplicate label %s" % dup) raise ValueError("Duplicate label %s" % dup)
strips = OrderedDict() super(StatusBoard, self).__init__(_order=labels, **{
for (green, red, button), label in zip(pins, labels): label: CompositeOutputDevice(
strips[label] = CompositeOutputDevice(
button=Button(button), button=Button(button),
lights=LEDBoard( lights=LEDBoard(
red=red, green=green, _order=('red', 'green'), **kwargs red=red, green=green, _order=('red', 'green'), **kwargs
), _order=('button', 'lights')) ), _order=('button', 'lights'))
super(StatusBoard, self).__init__(_order=strips.keys(), **strips) for (green, red, button), label in zip(pins, labels)
})
class SnowPi(LEDBoard): class SnowPi(LEDBoard):