commit 5c0c4557d76b3f1cec59dfe67a4e519137804170
author Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Jul 03 09:36:51 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Jul 03 09:36:51 2013 -0400
tree a79fe7eb6c6ea9528fff15f9da3e4dd198ac2f09
parent 66f4e61148ac4d3d694112f9174422f36cce96d0

fix imports

planetstack/openstack/event_manager.py

diff --git a/planetstack/openstack/event_manager.py b/planetstack/openstack/event_manager.py
index d7102b6..33c6bfb 100644
--- a/planetstack/openstack/event_manager.py
+++ b/planetstack/openstack/event_manager.py
@@ -7,7 +7,7 @@
 
 import os
 import base64
-import fofum
+from fofum import Fofum
 
 # decorator that marks dispatachable event methods  
 def event(func):

planetstack/openstack/observer.py

diff --git a/planetstack/openstack/observer.py b/planetstack/openstack/observer.py
index dce26aa..9e83f5b 100644
--- a/planetstack/openstack/observer.py
+++ b/planetstack/openstack/observer.py
@@ -9,7 +9,7 @@
 from django.db.models import F, Q
 from openstack.manager import OpenStackManager
 from util.logger import Logger, logging
-from timeout import timeout
+#from timeout import timeout
 
 
 logger = Logger(logfile='observer.log', level=logging.INFO)