Merge "Unused imports cleanup (folsom-2)"

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

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

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):

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__)

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

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

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

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

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

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

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