From e9ba12d0c240faf964f0dd06c015151fd52dd305 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 24 Jun 2013 09:37:49 -0400 Subject: [PATCH] cleanup --- planetstack/openstack/event_listener.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/planetstack/openstack/event_listener.py b/planetstack/openstack/event_listener.py index d3f0abf..adaa983 100644 --- a/planetstack/openstack/event_listener.py +++ b/planetstack/openstack/event_listener.py @@ -13,11 +13,13 @@ class EventHandler: def __init__(self): self.manager = OpenStackManager() - def get_events(self): + @staticmethod + def get_events(): events = [] - for attrib in dir(self): - if hasattr(attrib, 'event'): - events.append(getattr(attrib, 'event')) + for name in dir(EventHandler): + attribute = getattr(EventHandler, name) + if hasattr(attribute, 'event'): + events.append(getattr(attribute, 'event')) return events def dispatch(self, event, *args, **kwds): @@ -96,14 +98,12 @@ class EventListener: def run(self): # register events - event_names = [{'title': name} for name in self.handler.get_events()] + event_names = [{'title': name} for name in EventHandler.get_events()] url = 'http://www.feefie.com/command' params = {'action': 'add', 'u': 'pl', - 'events': event_names} + 'events': json.dumps(event_names)} r = requests.get(url, params=params) - print dir(r) - print r r_data = json.loads(r) events = r_data.get('events', []) # spanw a thread for each event -- 2.43.0