The statement self.event_handlers.pop({}) in remove_event_handler (eventhandler.py) throws an exeption because of the dict argument in the pop statement. Should this instead read: self.event_handlers.pop(event_name) ?