mxcubecore 1.372.0__py3-none-any.whl → 1.373.0__py3-none-any.whl

mxcubecore/BaseHardwareObjects.py

@@ -23,6 +23,7 @@ from __future__ import absolute_import
 import ast
 import copy
 import enum
+import itertools
 import logging
 import typing
 import warnings
@@ -520,14 +521,14 @@ class HardwareObjectNode:
         #
         # Look-up object by role the old way.
         #
-        objects = [self]
 
-        for curr in objects:
-            result = curr._objects_by_role.get(role)
-            if result is None:
-                objects.extend(obj for obj in curr if obj)
-
-            else:
+        #
+        # Look for object recursively, starting with our self
+        # and then checking the child objects.
+        #
+        for object in itertools.chain([self], *self.__objects):
+            result = object._objects_by_role.get(role)
+            if result is not None:
                 return result
 
     def _objects_names(self) -> List[Union[str, None]]:

{mxcubecore-1.372.0.dist-info → mxcubecore-1.373.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.372.0
+Version: 1.373.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.372.0.dist-info → mxcubecore-1.373.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mxcubecore/BaseHardwareObjects.py,sha256=KuvnwMTXRZsozQcuMqhQVGdj-T6xSsaeoFu2NuprL18,41184
+mxcubecore/BaseHardwareObjects.py,sha256=2kMsbOvqMsRv5qoHP_dOY6_eAC_roA_KP8o3BEN4b3w,41268
 mxcubecore/Command/Epics.py,sha256=9ftSEd4VdaFTE0qSrjL7LikLc_LJjz1-nNZF4J7hbWE,7748
 mxcubecore/Command/Exporter.py,sha256=HL6hncI_EUjjVX7frOsmxGa2Gyc-3PwUPXLUBJk4B20,8076
 mxcubecore/Command/Mockup.py,sha256=OrGAJC0JjTTjGSMZl7NiWJmVUQeEThMYdSQzuBD-bEc,1949
@@ -469,8 +469,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=0lPmqok_oYQZ059kJCq7RWdg490T8YKyRvoZGyWDy4M,14486
 mxcubecore/utils/tango.py,sha256=lAl7Su_GgyXFEEKZ1yu_2gU18wXHVaBbGR8RYcIOVYk,2100
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.372.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.372.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.372.0.dist-info/METADATA,sha256=EgkRmo0lExoyEJyWe9SQfkEw-SYqEfD3LNReVEjVpS0,4259
-mxcubecore-1.372.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.372.0.dist-info/RECORD,,
+mxcubecore-1.373.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.373.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.373.0.dist-info/METADATA,sha256=RxlY3zEk1cyD3sj9-jwKNlZvic6m6yEchwnJxsRWlhg,4259
+mxcubecore-1.373.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.373.0.dist-info/RECORD,,