raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

clean up: simplify code

Browse Source
This commit is contained in:
Andreas Preikschat 2014-03-31 19:32:49 +02:00
parent 20e7517b03
commit 3db984a846
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/common/registry.py
View File

@ -62,11 +62,9 @@ class Registry(object):
registry = cls() registry = cls()
registry.service_list = {} registry.service_list = {}
registry.functions_list = {} registry.functions_list = {}
registry.running_under_test = False
registry.initialising = True
# Allow the tests to remove Registry entries but not the live system # Allow the tests to remove Registry entries but not the live system
if 'nose' in sys.argv[0]: registry.running_under_test = 'nose' in sys.argv[0]
registry.running_under_test = True registry.initialising = True
return registry return registry
def get(self, key): def get(self, key):
@ -128,7 +126,7 @@ class Registry(object):
:param event: The function description.. :param event: The function description..
:param function: The function to be called when the event happens. :param function: The function to be called when the event happens.
""" """
if self.running_under_test is False: if not self.running_under_test:
trace_error_handler(log) trace_error_handler(log)
log.error('Invalid Method call for key %s' % event) log.error('Invalid Method call for key %s' % event)
raise KeyError('Invalid Method call for key %s' % event) raise KeyError('Invalid Method call for key %s' % event)