From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 7 Dec 2012 14:38:51 +0000 (+0100)
Subject: Move utils.py to a more appropriate location
X-Git-Tag: 2014.1~1111
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0c8416537bb26e975b340ae75a0388cf8c0cd712;p=openstack-build%2Fheat-build.git

Move utils.py to a more appropriate location

It's only used by the database code.

Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/db/api.py b/heat/db/api.py
index b2f8765d..abac96ca 100644
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -25,7 +25,7 @@ Usage:
 The underlying driver is loaded . SQLAlchemy is currently the only
 supported backend.
 '''
-import heat.utils
+from heat.db import utils
 from heat.openstack.common import cfg
 
 
@@ -37,7 +37,7 @@ db_opts = [
                help='The backend to use for db'),
     ]
 
-IMPL = heat.utils.LazyPluggable('db_backend',
+IMPL = utils.LazyPluggable('db_backend',
                            sqlalchemy='heat.db.sqlalchemy.api')
 
 
diff --git a/heat/db/migration.py b/heat/db/migration.py
index 610ef255..deaa2d44 100644
--- a/heat/db/migration.py
+++ b/heat/db/migration.py
@@ -14,7 +14,7 @@
 
 """Database setup and migration commands."""
 
-from heat import utils
+from heat.db import utils
 
 
 IMPL = utils.LazyPluggable('db_backend',
diff --git a/heat/utils.py b/heat/db/utils.py
similarity index 100%
rename from heat/utils.py
rename to heat/db/utils.py
diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index 3a12d051..f5655222 100644
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -40,7 +40,6 @@ except ImportError:
     from glance import client as glance_client
 from novaclient.v1_1 import client as nova_client
 import heat
-from heat import utils
 from heat.common import template_format
 from heat.engine import parser
 from heat import client as heat_client