Merge "Unused imports cleanup (folsom-2)"

52 files changed, 3 insertions, 93 deletions

diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 7c33c295e..554ff10d8 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -23,7 +23,6 @@ import nova.cert.rpcapi
 from nova import flags
 from nova import log as logging
 from nova import network
-from nova import rpc
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py
index c434695b0..a948a1e8a 100644
--- a/nova/api/sizelimit.py
+++ b/nova/api/sizelimit.py
@@ -21,7 +21,6 @@ Request Body limiting middleware.
 import webob.dec
 import webob.exc
 
-from nova import context
 from nova import flags
 from nova import log as logging
 from nova.openstack.common import cfg
diff --git a/nova/compute/api.py b/nova/compute/api.py
index b5babf30d..a0672cfff 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -42,12 +42,10 @@ import nova.image
 from nova import log as logging
 from nova import network
 from nova import notifications
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import jsonutils
 import nova.policy
 from nova import quota
-from nova import rpc
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import utils
 from nova import volume
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index f5f3c5f5e..f63203a1a 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -16,15 +16,11 @@
 
 """Compute-related Utilities and helpers."""
 
-import nova.context
 from nova import db
 from nova import flags
 from nova import log
-from nova import network
-from nova.network import model as network_model
 from nova import notifications
 from nova.notifier import api as notifier_api
-from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
index a2bffe2af..255b37683 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
@@ -20,8 +20,6 @@ from migrate import ForeignKeyConstraint
 from nova import flags
 from nova import log as logging
 
-from sets import Set
-
 FLAGS = flags.FLAGS
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/084_quotas_unlimited.py b/nova/db/sqlalchemy/migrate_repo/versions/084_quotas_unlimited.py
index bcbc2db90..d9308121d 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/084_quotas_unlimited.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/084_quotas_unlimited.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import migrate
 import sqlalchemy
 
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/096_recreate_dns_domains.py b/nova/db/sqlalchemy/migrate_repo/versions/096_recreate_dns_domains.py
index 2f023e989..8f893dbd5 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/096_recreate_dns_domains.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/096_recreate_dns_domains.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import select, Boolean, Column, DateTime, ForeignKey
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import MetaData, String, Table
 from migrate import ForeignKeyConstraint
 
diff --git a/nova/image/s3.py b/nova/image/s3.py
index d0746922f..9fcfd5c89 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -36,7 +36,6 @@ from nova import flags
 from nova import image
 from nova import log as logging
 from nova.openstack.common import cfg
-from nova import rpc
 from nova import utils
 
 
diff --git a/nova/network/api.py b/nova/network/api.py
index fa9567427..ecef022bc 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -18,12 +18,10 @@
 #    under the License.
 
 from nova.db import base
-from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.network import model as network_model
 from nova import rpc
-from nova.rpc import common as rpc_common
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/network/l3.py b/nova/network/l3.py
index 9aa6136fc..bcd5d87c0 100644
--- a/nova/network/l3.py
+++ b/nova/network/l3.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import random
-
 from nova import flags
 from nova import log as logging
 from nova.network import linux_net
diff --git a/nova/network/quantum/client.py b/nova/network/quantum/client.py
index 2b5a3f3fc..538a0b3a0 100644
--- a/nova/network/quantum/client.py
+++ b/nova/network/quantum/client.py
@@ -17,7 +17,6 @@
 #    @author: Tyler Smith, Cisco Systems
 
 import httplib
-import json
 import socket
 import urllib
 
diff --git a/nova/network/quantum/fake_client.py b/nova/network/quantum/fake_client.py
index 6be08449d..2e0231e61 100644
--- a/nova/network/quantum/fake_client.py
+++ b/nova/network/quantum/fake_client.py
@@ -16,8 +16,6 @@
 #    under the License.
 #    @author: Dan Wendlandt Nicira Networks
 
-import copy
-
 from nova.network.quantum import client
 from nova import utils
 
diff --git a/nova/notifier/api.py b/nova/notifier/api.py
index bc2690077..aa503fe32 100644
--- a/nova/notifier/api.py
+++ b/nova/notifier/api.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import inspect
 import uuid
 
 from nova import exception
diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index 0b927a0ee..57f7053ee 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -19,10 +19,8 @@
 
 import copy
 import logging
-import sys
 import traceback
 
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import local
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index d5247518e..98bf5099b 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -34,7 +34,6 @@ from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova import rpc
-from nova.rpc import common as rpc_common
 from nova import utils
 
 
diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py
index e081daf37..00db8e2c1 100644
--- a/nova/scheduler/filters/trusted_filter.py
+++ b/nova/scheduler/filters/trusted_filter.py
@@ -53,7 +53,6 @@ from nova import flags
 from nova import log as logging
 from nova.openstack.common import cfg
 from nova.scheduler import filters
-from nova import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/test.py b/nova/test.py
index a2edeb51a..0108958b8 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -24,8 +24,6 @@ inline callbacks.
 """
 
 import functools
-import os
-import shutil
 import unittest
 import uuid
 
diff --git a/nova/testing/runner.py b/nova/testing/runner.py
index 2b5004394..9abef4fee 100644
--- a/nova/testing/runner.py
+++ b/nova/testing/runner.py
@@ -73,9 +73,7 @@ reldir = os.path.join(os.path.dirname(__file__), '..', '..')
 absdir = os.path.abspath(reldir)
 sys.path.insert(0, absdir)
 
-from nova import flags
 from nova import log as logging
-from nova.openstack.common import cfg
 
 
 class _AnsiColorizer(object):
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index cb72b8bb4..ee3d5bba0 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -16,14 +16,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import webob.exc
-
 from nova.api.ec2 import cloud
-from nova.api.ec2 import ec2utils
-from nova.api.ec2 import inst_state
-from nova.compute import power_state
 from nova.compute import utils as compute_utils
-from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
index 41a1cd607..4b5c390e2 100644
--- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py
+++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
@@ -18,8 +18,6 @@
 import datetime
 
 from nova.api.openstack import compute
-from nova.api.openstack.compute import extensions
-from nova.api.openstack import wsgi
 import nova.db.api
 from nova import flags
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
index 730484f7d..9a3a72d55 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
@@ -24,7 +24,6 @@ from nova import db
 from nova import exception
 from nova import network
 from nova import rpc
-from nova.rpc import common as rpc_common
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import fake_network
diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
index b5a3f765a..5b545ec88 100644
--- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
+++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
@@ -16,8 +16,6 @@
 #    under the License.
 
 from nova.api.openstack import compute
-from nova.api.openstack.compute import extensions
-from nova.api.openstack import wsgi
 import nova.db.api
 from nova.openstack.common import jsonutils
 import nova.rpc
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index c9455bbe7..4d4ecdd2a 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -30,7 +30,7 @@ from nova.api.openstack import xmlutil
 from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
-from nova import utils
+
 
 FLAGS = flags.FLAGS
 
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index d8e87d1c2..a5cd2bbef 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -29,7 +29,6 @@ from nova import exception
 from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
-from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py
index a0a0c8284..f32704775 100644
--- a/nova/tests/api/openstack/test_wsgi.py
+++ b/nova/tests/api/openstack/test_wsgi.py
@@ -1,15 +1,12 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import inspect
-import json
 import webob
 
 from nova.api.openstack import wsgi
-import nova.context
 from nova import exception
 from nova import test
 from nova.tests.api.openstack import fakes
-from nova import utils
 
 
 class RequestTest(test.TestCase):
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index fd30bc2d2..03cd157da 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -24,12 +24,9 @@ import time
 
 from nova.consoleauth import manager
 from nova import context
-from nova import db
 from nova import flags
 from nova import log as logging
-from nova.openstack.common import importutils
 from nova import test
-from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index ef98d3337..5391da417 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -21,7 +21,6 @@ from nova import exception
 from nova import flags
 from nova.network import manager as network_manager
 from nova.network.quantum import nova_ipam_lib
-from nova.tests import fake_network_cache_model
 from nova import utils
 
 
diff --git a/nova/tests/glance/stubs.py b/nova/tests/glance/stubs.py
index e3bdf9dab..23d621568 100644
--- a/nova/tests/glance/stubs.py
+++ b/nova/tests/glance/stubs.py
@@ -19,7 +19,6 @@ import StringIO
 
 from glance.common import exception as glance_exception
 
-from nova import exception
 from nova.image import glance
 
 
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 88180c55a..e5b35645c 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.api.openstack.compute import extensions
 from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index ff38af492..15dc68396 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -23,7 +23,6 @@ import tempfile
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import log as logging
 from nova.network import linux_net
 from nova.network import manager as network_manager
diff --git a/nova/tests/rpc/test_common.py b/nova/tests/rpc/test_common.py
index 083323504..d349af46f 100644
--- a/nova/tests/rpc/test_common.py
+++ b/nova/tests/rpc/test_common.py
@@ -20,14 +20,11 @@ Unit Tests for 'common' functons used through rpc code.
 import json
 import sys
 
-from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova.rpc import amqp as rpc_amqp
 from nova.rpc import common as rpc_common
 from nova import test
-from nova.tests.rpc import common
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py
index 168906bdf..73c23e07b 100644
--- a/nova/tests/scheduler/test_filter_scheduler.py
+++ b/nova/tests/scheduler/test_filter_scheduler.py
@@ -23,7 +23,6 @@ from nova import exception
 from nova.scheduler import filter_scheduler
 from nova.scheduler import host_manager
 from nova.scheduler import least_cost
-from nova import test
 from nova.tests.scheduler import fakes
 from nova.tests.scheduler import test_scheduler
 
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index c8f02d357..3a2205aea 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -29,7 +29,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import notifications
 from nova import rpc
 from nova.rpc import common as rpc_common
 from nova.scheduler import driver
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index f1baffa0a..9669579fd 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -17,9 +17,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-import tempfile
-
 from nova import flags
 from nova.openstack.common import cfg
 from nova import test
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index 24605ea8b..bf08a7ea3 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -28,7 +28,6 @@ from nova import test
 
 from nova import db
 from nova import flags
-from nova import image
 from nova import log
 from nova import utils
 from nova.virt.libvirt import imagecache
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index dfceae4f3..958a00874 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -21,7 +21,6 @@ import mox
 import os
 import re
 import shutil
-import sys
 import tempfile
 
 from lxml import etree
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py
index 81b44e861..9e5ce24bd 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/test_libvirt_vif.py
@@ -19,9 +19,7 @@ from lxml import etree
 from nova import flags
 from nova import test
 from nova import utils
-from nova.virt import firewall
 from nova.virt.libvirt import config
-from nova.virt.libvirt import connection
 from nova.virt.libvirt import vif
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/test_log.py b/nova/tests/test_log.py
index 47d8867c1..7bb9a0295 100644
--- a/nova/tests/test_log.py
+++ b/nova/tests/test_log.py
@@ -1,7 +1,6 @@
 import cStringIO
 import json
 import logging
-import sys
 
 from nova import context
 from nova import flags
diff --git a/nova/tests/test_melange_ipam_lib.py b/nova/tests/test_melange_ipam_lib.py
index 9d262ed23..d752a5dee 100644
--- a/nova/tests/test_melange_ipam_lib.py
+++ b/nova/tests/test_melange_ipam_lib.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from nova import db
-from nova import exception
 from nova import flags
 from nova.network.quantum import melange_connection
 from nova.network.quantum import melange_ipam_lib
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index d3ef7ed95..c9e2f1bbf 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 import imp
-import json
 import os
 import StringIO
 import sys
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index d8a8969d8..f990a6730 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -27,7 +27,6 @@ import tempfile
 import eventlet
 from eventlet import greenpool
 import iso8601
-import lockfile
 import mox
 
 import nova
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 6fd278cd7..62bed35a0 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -22,13 +22,9 @@ import functools
 import os
 import re
 
-import mox
-
 from nova.compute import aggregate_states
 from nova.compute import instance_types
 from nova.compute import power_state
-from nova.compute import task_states
-from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py
index f90e6890c..36d499cc2 100644
--- a/nova/virt/baremetal/tilera.py
+++ b/nova/virt/baremetal/tilera.py
@@ -22,7 +22,6 @@ is provided here as an example of how to implement a backend.
 """
 
 import base64
-import os
 import subprocess
 import time
 
diff --git a/nova/virt/images.py b/nova/virt/images.py
index 626f3ff76..e89aed627 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -21,7 +21,6 @@
 Handling of VM disk images.
 """
 
-import errno
 import os
 
 from nova import exception
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 4b7d8889d..00823305b 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -20,14 +20,9 @@
 
 from eventlet import tpool
 
-from nova import context
-from nova import db
 from nova import flags
 from nova import log as logging
-from nova import utils
-
 import nova.virt.firewall as base_firewall
-from nova.virt import netutils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index 3a92b6253..e65d61067 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -28,8 +28,6 @@ import os
 import re
 import time
 
-from nova import compute
-from nova import context as db_context
 from nova import db
 from nova import flags
 from nova import log as logging
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index c9e640939..0c66791a6 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -36,8 +36,6 @@ import time
 
 from eventlet import event
 
-from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index c79f09026..8ce47662d 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -32,8 +32,6 @@ from eventlet import greenthread
 
 from nova.compute import api as compute
 from nova.compute import power_state
-from nova.compute import task_states
-from nova.compute import vm_states
 from nova import context as nova_context
 from nova import db
 from nova import exception
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index eadc6cf5c..531033a52 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -22,14 +22,11 @@ and storage repositories
 import re
 import string
 
-from nova import context
-from nova import db
-from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import utils
 from nova.virt import xenapi
 
+
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py
index 593b4aa9f..ecf5c2551 100644
--- a/nova/vnc/xvp_proxy.py
+++ b/nova/vnc/xvp_proxy.py
@@ -31,7 +31,6 @@ from nova import context
 from nova import flags
 from nova import log as logging
 from nova.openstack.common import cfg
-from nova import rpc
 from nova import version
 from nova import wsgi
 
diff --git a/nova/volume/manager.py b/nova/volume/manager.py
index 6ca923bd0..ef651bc38 100644
--- a/nova/volume/manager.py
+++ b/nova/volume/manager.py
@@ -47,10 +47,8 @@ from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova import quota
-from nova import rpc
 from nova import utils
 from nova.volume import utils as volume_utils
-from nova.volume import volume_types
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 118fd14e1..436f4df2e 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -33,7 +33,6 @@ import webob.exc
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import utils
 
 
 FLAGS = flags.FLAGS