Fix up some imports so they work. I think this is right now. :)

Signed-off-by: Ian Main <imain@redhat.com>

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 1c3887d061ad56e533d8e32e13286c61a41fc7dd..a45453459defd3bde1bc94159d5d6fd39a767376 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -46,7 +46,7 @@ import logging
 from eventlet import greenthread
 
 import heat.context
-from heat import exception
+from heat.common import exception
 from heat import manager
 from heat.openstack.common import cfg
 from heat import rpc

diff --git a/heat/service.py b/heat/service.py
index 5f0cfbd48b5fb8cb513c34d49ffc999d680bdbb7..bf4340f55474fe84ce4214568989eed344d8b9fc 100644 (file)
--- a/heat/service.py
+++ b/heat/service.py
@@ -30,9 +30,9 @@ from heat.openstack.common import cfg
 
 from heat.common import utils
 from heat.common import config
+from heat.common import exception
 
 from heat import context
-from heat import exception
 from heat import rpc
 from heat import version