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

Merge pull request #360 from lurch/composite_tweaks

Browse Source 
Minor CompositeDevice tweaks
This commit is contained in:
Ben Nuttall
2016-06-09 21:27:57 +01:00
committed by GitHub
parent 8f881bae1b 68f5f74668
commit 2912020267
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gpiozero/devices.py
View File

@@ -268,9 +268,10 @@ class CompositeDevice(Device):
self._order = kwargs.pop('_order', None) self._order = kwargs.pop('_order', None)
if self._order is None: if self._order is None:
self._order = sorted(kwargs.keys()) self._order = sorted(kwargs.keys())
else:
for missing_name in set(kwargs.keys()) - set(self._order):
raise CompositeDeviceBadOrder('%s missing from _order' % missing_name)
self._order = tuple(self._order) self._order = tuple(self._order)
for missing_name in set(kwargs.keys()) - set(self._order):
raise CompositeDeviceBadOrder('%s missing from _order' % missing_name)
super(CompositeDevice, self).__init__() super(CompositeDevice, self).__init__()
for name in set(self._order) & set(dir(self)): for name in set(self._order) & set(dir(self)):
raise CompositeDeviceBadName('%s is a reserved name' % name) raise CompositeDeviceBadName('%s is a reserved name' % name)
@@ -303,7 +304,7 @@ class CompositeDevice(Device):
self._check_open() self._check_open()
return "<gpiozero.%s object containing %d devices: %s and %d unnamed>" % ( return "<gpiozero.%s object containing %d devices: %s and %d unnamed>" % (
self.__class__.__name__, self.__class__.__name__,
len(self), ','.join(self._named), len(self), ','.join(self._order),
len(self) - len(self._named) len(self) - len(self._named)
) )
except DeviceClosed: except DeviceClosed: