Merge "Remove unused imports"

cinder/api/openstack/common.py

@@ -15,19 +15,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import functools
 import os
 import re
 import urlparse
 
 import webob
-from xml.dom import minidom
 
-from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
 from cinder import flags
 from cinder.openstack.common import log as logging
-from cinder import quota
 
 
 LOG = logging.getLogger(__name__)

cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py

@@ -20,7 +20,6 @@ from cinder.api.openstack import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
 from cinder import volume
-from cinder import db
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

cinder/api/openstack/volume/contrib/volume_actions.py

@@ -13,7 +13,6 @@
 #   under the License.
 
 import webob
-from webob import exc
 from xml.dom import minidom
 
 from cinder.api.openstack import extensions
@@ -22,7 +21,6 @@ from cinder.api.openstack import xmlutil
 from cinder import volume
 from cinder import exception
 from cinder import flags
-from cinder import utils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.rpc import common as rpc_common
 

cinder/api/openstack/wsgi.py

@@ -18,8 +18,6 @@
 import inspect
 from xml.dom import minidom
 from xml.parsers import expat
-import math
-import time
 
 from lxml import etree
 import webob

cinder/api/sizelimit.py

@@ -21,7 +21,6 @@ Request Body limiting middleware.
 import webob.dec
 import webob.exc
 
-from cinder import context
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg

cinder/db/sqlalchemy/migration.py

@@ -18,7 +18,6 @@
 
 import distutils.version as dist_version
 import os
-import sys
 
 from cinder.db import migration
 from cinder.db.sqlalchemy.session import get_engine

cinder/db/sqlalchemy/models.py

@@ -31,7 +31,6 @@ from cinder.db.sqlalchemy.session import get_session
 
 from cinder import exception
 from cinder import flags
-from cinder import utils
 from cinder.openstack.common import timeutils
 
 

cinder/openstack/common/notifier/api.py

@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import inspect
 import uuid
 
 from cinder.openstack.common import cfg

cinder/openstack/common/rpc/common.py

@@ -19,10 +19,8 @@
 
 import copy
 import logging
-import sys
 import traceback
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils

cinder/test.py

@@ -24,8 +24,6 @@ inline callbacks.
 """
 
 import functools
-import os
-import shutil
 import uuid
 import unittest
 
@@ -37,7 +35,6 @@ from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
 from cinder.openstack.common import timeutils
-from cinder import utils
 from cinder import service
 from cinder import tests
 from cinder.tests import fake_flags

cinder/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 cinder import flags
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import cfg
 
 
 class _AnsiColorizer(object):

cinder/tests/api/openstack/common.py

@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import webob
-
 
 def compare_links(actual, expected):
     """Compare xml atom links."""

cinder/tests/api/openstack/test_common.py

@@ -19,15 +19,11 @@
 Test suites for 'common' code used throughout the OpenStack HTTP API.
 """
 
-from lxml import etree
 import webob
 import webob.exc
-import xml.dom.minidom as minidom
 
-from cinder import exception
 from cinder import test
 from cinder.api.openstack import common
-from cinder.api.openstack import xmlutil
 
 
 NS = "{http://docs.openstack.org/compute/api/v1.1}"

cinder/tests/api/openstack/test_wsgi.py

@@ -1,15 +1,12 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import inspect
-import json
 import webob
 
 from cinder import exception
 from cinder import test
-from cinder import utils
 from cinder.api.openstack import wsgi
 from cinder.tests.api.openstack import fakes
-import cinder.context
 
 
 class RequestTest(test.TestCase):

cinder/tests/db/fakes.py

@@ -19,7 +19,6 @@
 """Stubouts, mocks and fixtures for the test suite"""
 
 from cinder import db
-from cinder import exception
 
 
 class FakeModel(object):

cinder/tests/integrated/api/client.py

@@ -15,7 +15,6 @@
 #    under the License.
 
 import httplib
-import urllib
 import urlparse
 
 from cinder.openstack.common import log as logging

cinder/tests/integrated/test_extensions.py

@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder.api.openstack.volume import extensions
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder.tests.integrated import integrated_helpers

cinder/tests/integrated/test_xml.py

@@ -20,7 +20,6 @@ from lxml import etree
 from cinder.openstack.common import log as logging
 from cinder.tests.integrated import integrated_helpers
 from cinder.api.openstack import common
-from cinder.api.openstack import xmlutil
 
 
 LOG = logging.getLogger(__name__)

cinder/tests/scheduler/fakes.py

@@ -16,9 +16,7 @@
 Fakes For Scheduler tests.
 """
 
-import mox
 
-from cinder import db
 from cinder.scheduler import host_manager
 
 

cinder/tests/scheduler/test_scheduler.py

@@ -19,21 +19,15 @@
 Tests For Scheduler
 """
 
-import datetime
-import json
 
 from cinder import context
 from cinder import db
-from cinder import exception
 from cinder import flags
-from cinder.openstack.common.notifier import api as notifier
 from cinder.openstack.common import rpc
-from cinder.openstack.common.rpc import common as rpc_common
 from cinder.openstack.common import timeutils
 from cinder.scheduler import driver
 from cinder.scheduler import manager
 from cinder import test
-from cinder.tests.scheduler import fakes
 from cinder import utils
 
 FLAGS = flags.FLAGS

cinder/tests/test_flags.py

@@ -17,8 +17,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-import tempfile
 
 from cinder import flags
 from cinder.openstack.common import cfg

cinder/tests/test_migrations.py

@@ -27,7 +27,6 @@ if possible.
 import ConfigParser
 import commands
 import os
-import unittest
 import urlparse
 
 from migrate.versioning import repository

cinder/tests/test_misc.py

@@ -14,19 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import commands
-import errno
 import glob
 import os
-import select
 
-from eventlet import greenpool
-from eventlet import greenthread
-import lockfile
 
 from cinder import exception
 from cinder import test
-from cinder import utils
 
 
 class ExceptionTestCase(test.TestCase):

cinder/tests/test_quota.py

@@ -24,7 +24,6 @@ from cinder import quota
 from cinder.openstack.common import rpc
 from cinder import test
 from cinder import volume
-from cinder.scheduler import driver as scheduler_driver
 
 
 FLAGS = flags.FLAGS

cinder/tests/test_storwize_svc.py

@@ -31,7 +31,6 @@ from cinder import exception
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder import utils
 from cinder.volume import storwize_svc
 
 LOG = logging.getLogger(__name__)

cinder/tests/test_test_utils.py

@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder import db
 from cinder import test
 from cinder.tests import utils as test_utils
 

cinder/tests/test_utils.py

@@ -19,15 +19,9 @@ import datetime
 import hashlib
 import os
 import os.path
-import socket
-import shutil
 import StringIO
 import tempfile
 
-import eventlet
-from eventlet import greenpool
-import iso8601
-import lockfile
 import mox
 
 import cinder

cinder/volume/netapp.py

@@ -24,7 +24,6 @@ ONTAP 7-mode storage systems with installed iSCSI licenses.
 """
 
 import time
-import string
 
 import suds
 from suds import client

cinder/volume/storwize_svc.py

@@ -49,7 +49,6 @@ from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
-from cinder import utils
 from cinder.volume import san
 
 LOG = logging.getLogger(__name__)