Module: deluge Branch: improved-logging Commit: 90d23ce58261e3b0b288501d7aa01c97dc72d21a
Author: Pedro Algarvio <[email protected]> Date: Fri Dec 10 05:42:19 2010 +0000 Revert e52018bfcd660251d94af2878b58ebacf6d82424. Simply fail. It's documented on the ChangeLog. --- deluge/core/eventmanager.py | 14 +------------- deluge/ui/client.py | 15 +-------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/deluge/core/eventmanager.py b/deluge/core/eventmanager.py index 0f61645..b4aa175 100644 --- a/deluge/core/eventmanager.py +++ b/deluge/core/eventmanager.py @@ -53,19 +53,7 @@ class EventManager(component.Component): if event.name in self.handlers: for handler in self.handlers[event.name]: #log.debug("Running handler %s for event %s with args: %s", event.name, handler, event.args) - try: - handler(*event.args) - except TypeError: - if event.name != "TorrentAddedEvent": - raise - else: - log.warning("TorrentAddedEvent recently got an extra " - "argument, \"from_state\" and the handler " - "\"%s\" is not accepting that extra " - "argument. Correcting for now but this code " - "should be changed.", handler) - handler(event.args[0]) - + handler(*event.args) def register_event_handler(self, event, handler): """ diff --git a/deluge/ui/client.py b/deluge/ui/client.py index f040244..d88f6e6 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -167,22 +167,9 @@ class DelugeRPCProtocol(Protocol): #log.debug("Received RPCEvent: %s", event) # A RPCEvent was received from the daemon so run any handlers # associated with it. - def call_handler(event, handler, args): - try: - handler(*args) - except TypeError: - if event != "TorrentAddedEvent": - raise - else: - log.warning("TorrentAddedEvent recently got an extra " - "argument, \"from_state\" and the handler " - "\"%s\" is not accepting that extra " - "argument. Correcting for now but this code " - "should be changed.", handler) - handler(args[0]) if event in self.factory.event_handlers: for handler in self.factory.event_handlers[event]: - reactor.callLater(0, call_handler, event, handler, request[2]) + reactor.callLater(0, handler, *request[2]) continue request_id = request[1] -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
