From 2358f6d5bc3e79f6d973ec25de81569286aeabc4 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 27 Feb 2013 11:00:32 -0700 Subject: [PATCH] Remove unused imports from repo in preperation for pyflakes Lots of unused imports Fixes: Bug #1131275 Change-Id: Iacb1d02173b0ec0e0dc81aff84ca6e29e60e2934 Signed-off-by: Steven Dake --- heat/api/cfn/v1/waitcondition.py | 1 - heat/cfn_client/boto_client_cloudwatch.py | 4 ---- heat/engine/resources/autoscaling.py | 1 - heat/engine/resources/wait_condition.py | 1 - heat/tests/__init__.py | 3 +-- heat/tests/functional/test_CFN_API_Actions.py | 1 - heat/tests/functional/test_CFN_API_Actions_Boto.py | 1 - heat/tests/functional/test_CFN_API_UpdateStack.py | 1 - heat/tests/test_common_policy.py | 1 - heat/tests/test_event.py | 1 - heat/tests/test_loadbalancer.py | 2 -- heat/tests/test_metadata_refresh.py | 8 -------- heat/tests/test_template_format.py | 2 -- 13 files changed, 1 insertion(+), 26 deletions(-) diff --git a/heat/api/cfn/v1/waitcondition.py b/heat/api/cfn/v1/waitcondition.py index a5f75788..7780c631 100644 --- a/heat/api/cfn/v1/waitcondition.py +++ b/heat/api/cfn/v1/waitcondition.py @@ -14,7 +14,6 @@ # under the License. from heat.common import wsgi -from heat.common import context from heat.rpc import client as rpc_client from heat.common import identifier from heat.api.aws import exception diff --git a/heat/cfn_client/boto_client_cloudwatch.py b/heat/cfn_client/boto_client_cloudwatch.py index 2258bdd0..111fca02 100644 --- a/heat/cfn_client/boto_client_cloudwatch.py +++ b/heat/cfn_client/boto_client_cloudwatch.py @@ -21,10 +21,6 @@ from heat.openstack.common import log as logging logger = logging.getLogger(__name__) from boto.ec2.cloudwatch import CloudWatchConnection -from boto.ec2.cloudwatch.metric import Metric -from boto.ec2.cloudwatch.alarm import MetricAlarm, MetricAlarms -from boto.ec2.cloudwatch.alarm import AlarmHistoryItem -from boto.ec2.cloudwatch.datapoint import Datapoint class BotoCWClient(CloudWatchConnection): diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py index fd16cece..eaaf9797 100644 --- a/heat/engine/resources/autoscaling.py +++ b/heat/engine/resources/autoscaling.py @@ -14,7 +14,6 @@ # under the License. from heat.common import exception -from heat.engine.resources import instance from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index 87b110a5..b4fed810 100644 --- a/heat/engine/resources/wait_condition.py +++ b/heat/engine/resources/wait_condition.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import time import urllib import urlparse import json diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py index caf390e2..70f0b832 100644 --- a/heat/tests/__init__.py +++ b/heat/tests/__init__.py @@ -29,9 +29,8 @@ def reset_db(): def setup(): import mox # Fail fast if you don't have mox. Workaround for bug 810424 - - from heat import db from heat.db import migration + from heat import db reset_db() migration.db_sync() diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py index f197e209..7a661614 100644 --- a/heat/tests/functional/test_CFN_API_Actions.py +++ b/heat/tests/functional/test_CFN_API_Actions.py @@ -16,7 +16,6 @@ import os import util import verify import re -import nose from nose.plugins.attrib import attr import unittest import json diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py index cbfd0ecf..2dff0237 100644 --- a/heat/tests/functional/test_CFN_API_Actions_Boto.py +++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py @@ -16,7 +16,6 @@ import os import util import verify import re -import nose from nose.plugins.attrib import attr import unittest import json diff --git a/heat/tests/functional/test_CFN_API_UpdateStack.py b/heat/tests/functional/test_CFN_API_UpdateStack.py index fac22168..4dc86eac 100644 --- a/heat/tests/functional/test_CFN_API_UpdateStack.py +++ b/heat/tests/functional/test_CFN_API_UpdateStack.py @@ -14,7 +14,6 @@ import os import util -import verify from nose.plugins.attrib import attr import unittest diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py index 4e43ffc9..8730d8f9 100644 --- a/heat/tests/test_common_policy.py +++ b/heat/tests/test_common_policy.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import json import os.path import mox diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 90d9e7cc..04e361aa 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -22,7 +22,6 @@ import heat.db as db_api from heat.engine import parser from heat.engine import template from heat.engine import event -from heat.engine import resource tmpl = { diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index a4d956e8..3b8b40a6 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -25,14 +25,12 @@ from oslo.config import cfg from heat.common import exception from heat.common import context from heat.common import template_format -from heat.common import identifier from heat.engine import parser from heat.engine.resources import instance from heat.engine.resources import user from heat.engine.resources import loadbalancer as lb from heat.engine.resources import wait_condition as wc from heat.engine.resource import Metadata -from heat.engine.resources import stack from heat.tests.v1_1 import fakes from heat.tests import fakes as test_fakes diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 22249fe6..c7631cfe 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -14,23 +14,15 @@ import mox -import uuid -import time -import datetime -import json import eventlet import unittest from nose.plugins.attrib import attr -from oslo.config import cfg - from heat.tests import fakes from heat.tests.utils import stack_delete_after -import heat.db as db_api from heat.common import template_format -from heat.common import identifier from heat.engine import parser from heat.engine.resources import instance from heat.common import context diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index 543c75ca..9c6197e9 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -12,11 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import json from nose.plugins.attrib import attr import os import unittest -import yaml from heat.common import context from heat.common import template_format -- 2.45.2