follow up change for 'better order of accessibles' (34904)
slight change to make it compatible with py 3.6/3.7, where reversed(<dict>) was not allowed. Change-Id: Id440870b5523a866b3afb470ba5db9cd6a9bb0ec Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35002 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
parent
e0e442814f
commit
b28cdefe8a
@ -41,7 +41,7 @@ from frappy.logging import RemoteLogHandler
|
|||||||
# from .interfaces import SECoP_BASE_CLASSES
|
# from .interfaces import SECoP_BASE_CLASSES
|
||||||
# WORKAROUND:
|
# WORKAROUND:
|
||||||
SECoP_BASE_CLASSES = ['Readable', 'Writable', 'Drivable', 'Communicator']
|
SECoP_BASE_CLASSES = ['Readable', 'Writable', 'Drivable', 'Communicator']
|
||||||
PREDEF_ORDER = list(reversed(PREDEFINED_ACCESSIBLES))
|
PREDEF_ORDER = list(PREDEFINED_ACCESSIBLES)
|
||||||
|
|
||||||
Done = UniqueObject('Done')
|
Done = UniqueObject('Done')
|
||||||
"""a special return value for a read_<param>/write_<param> method
|
"""a special return value for a read_<param>/write_<param> method
|
||||||
@ -101,7 +101,7 @@ class HasAccessibles(HasProperties):
|
|||||||
# rebuild order:
|
# rebuild order:
|
||||||
# (1) predefined accessibles, in a predefined order, (2) inherited custom items, (3) new custom items
|
# (1) predefined accessibles, in a predefined order, (2) inherited custom items, (3) new custom items
|
||||||
# move (1) to the beginning
|
# move (1) to the beginning
|
||||||
for key in PREDEF_ORDER:
|
for key in reversed(PREDEF_ORDER):
|
||||||
if key in accessibles:
|
if key in accessibles:
|
||||||
accessibles.move_to_end(key, last=False)
|
accessibles.move_to_end(key, last=False)
|
||||||
# move (3) to the end
|
# move (3) to the end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user