refactored

Signed-off-by: René <snooz@posteo.de>

Author: Snooz82

src/robotlibcore.py

@@ -45,7 +45,7 @@ def __init__(self, library_components):
         self.attributes = {}
         self.add_library_components(library_components)
         self.add_library_components([self])
-        self._set_library_listeners(library_components)
+        self.__set_library_listeners(library_components)
 
     def add_library_components(self, library_components):
         self.keywords_spec["__init__"] = KeywordBuilder.build(self.__init__)
@@ -60,23 +60,13 @@ def add_library_components(self, library_components):
                     # method names as well as possible custom names.
                     self.attributes[name] = self.attributes[kw_name] = kw
 
-    def _set_library_listeners(self, library_components: list):
-        listeners = self._get_component_listeners(library_components)
-        listeners = self._insert_manually_registered_listeners(listeners)
-        listeners = self._insert_self_to_listeners(listeners)
+    def __set_library_listeners(self, library_components: list):
+        listeners = self.__get_component_listeners([self, *library_components])
+        listeners = self.__insert_manually_registered_listeners(listeners)
         if listeners:
-            self.ROBOT_LIBRARY_LISTENER = listeners
+            self.ROBOT_LIBRARY_LISTENER = list(dict.fromkeys(listeners).keys())
 
-    def _insert_self_to_listeners(self, component_listeners: list) -> list:
-        if self not in component_listeners:
-            try:
-                getattr(self, "ROBOT_LISTENER_API_VERSION")
-                return [self, *component_listeners]
-            except AttributeError:
-                pass
-        return component_listeners
-
-    def _insert_manually_registered_listeners(self, component_listeners: list) -> list:
+    def __insert_manually_registered_listeners(self, component_listeners: list) -> list:
         try:
             manually_registered_listener = getattr(self, "ROBOT_LIBRARY_LISTENER")
             try:
@@ -86,7 +76,7 @@ def _insert_manually_registered_listeners(self, component_listeners: list) -> li
         except AttributeError:
             return component_listeners
 
-    def _get_component_listeners(self, library_listeners: list) -> list:
+    def __get_component_listeners(self, library_listeners: list) -> list:
         return [component for component in library_listeners if hasattr(component, "ROBOT_LISTENER_API_VERSION")]
 
     def __get_members(self, component):

utest/test_robotlibcore.py

@@ -41,11 +41,7 @@ def test_dir():
         "_DynamicCore__get_keyword_path",
         "_HybridCore__get_members",
         "_HybridCore__get_members_from_instance",
-        '_get_component_listeners',
-        '_insert_manually_registered_listeners',
-        '_insert_self_to_listeners',
-        '_other_name_here',
-        '_set_library_listeners',
+        "_other_name_here",
         "add_library_components",
         "all_arguments",
         "attributes",