From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 3 Jul 2013 13:36:51 +0000 (-0400)
Subject: fix imports
X-Git-Tag: 1.0~6^2~1
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=5c0c4557d76b3f1cec59dfe67a4e519137804170

fix imports
---

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 @@ from planetstack.config import Config
 
 import os
 import base64
-import fofum
+from fofum import Fofum
 
 # decorator that marks dispatachable event methods  
 def event(func):
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 core.models import *
 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)