Merge pull request #259 from lurch/patch-2

Ensure CompositeDevice._order has deterministic behaviour
This commit is contained in:
Dave Jones
2016-04-07 20:49:34 +01:00

View File

@@ -260,7 +260,7 @@ class CompositeDevice(Device):
self._tuple = None
self._order = kwargs.pop('_order', None)
if self._order is None:
self._order = kwargs.keys()
self._order = sorted(kwargs.keys())
self._order = tuple(self._order)
for missing_name in set(kwargs.keys()) - set(self._order):
raise CompositeDeviceBadOrder('%s missing from _order' % missing_name)