Revision: d0aa87b9c5af
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Wed May 28 12:53:02 2014 UTC
Log: Update issue 811
Cleanup
http://code.google.com/p/robotframework/source/detail?r=d0aa87b9c5af
Modified:
/src/robot/running/namespace.py
/src/robot/running/testlibraries.py
=======================================
--- /src/robot/running/namespace.py Mon May 26 15:18:30 2014 UTC
+++ /src/robot/running/namespace.py Wed May 28 12:53:02 2014 UTC
@@ -58,7 +58,7 @@
@property
def library_listeners(self):
for lib in self._testlibs.itervalues():
- if lib.listener:
+ if lib.has_listener:
yield lib.listener
def handle_imports(self):
=======================================
--- /src/robot/running/testlibraries.py Wed May 28 10:09:35 2014 UTC
+++ /src/robot/running/testlibraries.py Wed May 28 12:53:02 2014 UTC
@@ -71,7 +71,7 @@
self.positional_args = []
self.named_args = {}
self._instance_cache = []
- self._has_listener = False # Set when instance is created
+ self.has_listener = None # Set when first instance is created
self._libinst = None
if libcode is not None:
self._doc = getdoc(libcode)
@@ -88,19 +88,16 @@
@property
def listener(self):
- if self._has_listener:
- return self._get_instance_listener(self.get_instance())
+ if self.has_listener:
+ return self._get_listener(self.get_instance())
return None
- def _get_instance_listener(self, inst):
- if not inst:
- return None
+ def _get_listener(self, inst):
return getattr(inst, 'ROBOT_LIBRARY_LISTENER', None)
def create_handlers(self):
if self._libcode:
- self._libinst = self.get_instance()
- self.handlers = self._create_handlers(self._libinst)
+ self.handlers = self._create_handlers(self.get_instance())
self.init_scope_handling()
def start_suite(self):
@@ -162,14 +159,14 @@
def get_instance(self):
if self._libinst is None:
self._libinst = self._get_instance()
+ if self.has_listener is None:
+ self.has_listener = self._get_listener(self._libinst) is not
None
return self._libinst
def _get_instance(self):
with OutputCapturer(library_import=True):
try:
- instance = self._libcode(*self.positional_args,
**self.named_args)
- self._has_listener = self._get_instance_listener(instance)
is not None
- return instance
+ return self._libcode(*self.positional_args,
**self.named_args)
except:
self._raise_creating_instance_failed()
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
