fixed review comments

Snooz82 · aaltat · commit 729aa6c75049 · 2023-01-31T21:48:11.000+02:00
Signed-off-by: René &lt;snooz@posteo.de&gt;
diff --git a/atest/ListenerCore.py b/atest/ListenerCore.py
@@ -1,6 +1,3 @@
-from robot.api import logger
-
-
 from robotlibcore import DynamicCore, keyword
 
 
@@ -19,13 +16,11 @@ def __init__(self):
 
     @keyword
     def listener_core(self, arg: str):
-        logger.info(arg)
         assert arg == self.keyword_args.get("args", [None])[0], "First argument should be detected by listener, but was not."
 
     def start_keyword(self, name, args):
         self.keyword_name = name
         self.keyword_args = args
-        logger.info(f"start: {name}")
 
 
 class FirstComponent:
@@ -36,11 +31,9 @@ def __init__(self):
 
     def _start_suite(self, name, attrs):
         self.suite_name = name
-        logger.console(f"start suite: {name}")
 
     @keyword
     def first_component(self, arg: str):
-        logger.info(arg)
         assert arg == self.suite_name, f"Suite name '{self.suite_name}' should be detected by listener, but was not."
 
 
@@ -51,7 +44,6 @@ def __init__(self):
 
     @keyword
     def second_component(self, arg: str):
-        logger.info(arg)
         assert self.listener.test.name == arg, "Test case name should be detected by listener, but was not."
 
 
diff --git a/src/robotlibcore.py b/src/robotlibcore.py
@@ -67,14 +67,11 @@ def __set_library_listeners(self, library_components: list):
             self.ROBOT_LIBRARY_LISTENER = list(dict.fromkeys(listeners))
 
     def __insert_manually_registered_listeners(self, component_listeners: list) -> list:
+        manually_registered_listener = getattr(self, "ROBOT_LIBRARY_LISTENER", [])
         try:
-            manually_registered_listener = getattr(self, "ROBOT_LIBRARY_LISTENER")
-            try:
-                return [*manually_registered_listener, *component_listeners]
-            except TypeError:
-                return [manually_registered_listener, *component_listeners]
-        except AttributeError:
-            return component_listeners
+            return [*manually_registered_listener, *component_listeners]
+        except TypeError:
+            return [manually_registered_listener, *component_listeners]
 
     def __get_component_listeners(self, library_listeners: list) -> list:
         return [component for component in library_listeners if hasattr(component, "ROBOT_LISTENER_API_VERSION")]
