From 0c8416537bb26e975b340ae75a0388cf8c0cd712 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 7 Dec 2012 15:38:51 +0100 Subject: [PATCH] Move utils.py to a more appropriate location It's only used by the database code. Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7 Signed-off-by: Zane Bitter --- heat/db/api.py | 4 ++-- heat/db/migration.py | 2 +- heat/{ => db}/utils.py | 0 heat/tests/functional/util.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) rename heat/{ => db}/utils.py (100%) diff --git a/heat/db/api.py b/heat/db/api.py index b2f8765d3..abac96ca0 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 610ef2556..deaa2d442 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 3a12d0513..f5655222d 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