From 0411fd29af3cebbc053709b79914286c16ec067b Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Thu, 5 Apr 2012 17:52:34 -0500
Subject: [PATCH] Remove unused imports.

Change-Id: I9d602ed429caff8ffb00e40f623c473c5425e1cc
---
 glance/tests/functional/test_logging.py                   | 2 --
 glance/tests/functional/test_respawn.py                   | 2 +-
 glance/tests/functional/test_scrubber.py                  | 3 ---
 .../tests/functional/v1/test_bin_glance_cache_manage.py   | 4 ----
 glance/tests/functional/v1/test_cache_middleware.py       | 1 -
 glance/tests/functional/v1/test_s3.py                     | 5 +----
 glance/tests/functional/v1/test_ssl.py                    | 6 +-----
 glance/tests/functional/v1/test_swift.py                  | 1 -
 glance/tests/stubs.py                                     | 2 --
 glance/tests/unit/test_clients.py                         | 8 --------
 glance/tests/unit/test_context.py                         | 2 --
 glance/tests/unit/test_db.py                              | 1 -
 glance/tests/unit/test_filesystem_store.py                | 3 ---
 glance/tests/unit/test_image_cache.py                     | 1 -
 glance/tests/unit/test_s3_store.py                        | 5 +----
 15 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/glance/tests/functional/test_logging.py b/glance/tests/functional/test_logging.py
index 7f0e6e7aff..ca07cb1436 100644
--- a/glance/tests/functional/test_logging.py
+++ b/glance/tests/functional/test_logging.py
@@ -20,10 +20,8 @@
 import httplib2
 import os
 import stat
-import unittest
 
 from glance.tests import functional
-from glance.tests.utils import execute
 
 
 class TestLogging(functional.FunctionalTest):
diff --git a/glance/tests/functional/test_respawn.py b/glance/tests/functional/test_respawn.py
index fd4dc3a2c8..59a20e92ed 100644
--- a/glance/tests/functional/test_respawn.py
+++ b/glance/tests/functional/test_respawn.py
@@ -25,7 +25,7 @@ import sys
 import time
 
 from glance.tests import functional
-from glance.tests.utils import execute, skip_if_disabled
+from glance.tests.utils import skip_if_disabled
 
 
 class TestRespawn(functional.FunctionalTest):
diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py
index 9e1fad30b7..7d17058492 100644
--- a/glance/tests/functional/test_scrubber.py
+++ b/glance/tests/functional/test_scrubber.py
@@ -15,12 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
 import time
-import unittest
 
 from glance.tests import functional
-from glance.tests.utils import execute
 
 from glance import client
 from glance.registry import client as registry_client
diff --git a/glance/tests/functional/v1/test_bin_glance_cache_manage.py b/glance/tests/functional/v1/test_bin_glance_cache_manage.py
index 0761b4a990..4d73e7d450 100644
--- a/glance/tests/functional/v1/test_bin_glance_cache_manage.py
+++ b/glance/tests/functional/v1/test_bin_glance_cache_manage.py
@@ -17,15 +17,11 @@
 
 """Functional test case that utilizes the bin/glance-cache-manage CLI tool"""
 
-import datetime
 import hashlib
 import httplib2
 import json
 import os
-import time
-import unittest
 
-from glance.common import utils
 from glance.tests import functional
 from glance.tests.utils import execute, minimal_headers
 
diff --git a/glance/tests/functional/v1/test_cache_middleware.py b/glance/tests/functional/v1/test_cache_middleware.py
index e9213884d8..84c80c3a97 100644
--- a/glance/tests/functional/v1/test_cache_middleware.py
+++ b/glance/tests/functional/v1/test_cache_middleware.py
@@ -26,7 +26,6 @@ import hashlib
 import json
 import os
 import shutil
-import thread
 import time
 
 import httplib2
diff --git a/glance/tests/functional/v1/test_s3.py b/glance/tests/functional/v1/test_s3.py
index c4fed3f19c..868b8cbbd2 100644
--- a/glance/tests/functional/v1/test_s3.py
+++ b/glance/tests/functional/v1/test_s3.py
@@ -32,16 +32,13 @@ skipped.
 
 import hashlib
 import json
-import tempfile
-import unittest
 
 import httplib2
 
 from glance.common import crypt
 from glance.common import utils
 from glance.tests.functional.v1 import test_api
-from glance.tests.utils import (execute,
-                                skip_if_disabled,
+from glance.tests.utils import (skip_if_disabled,
                                 requires,
                                 minimal_headers)
 from glance.tests.functional.store_utils import (setup_s3,
diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py
index 5ac0b10f85..c97d0171d6 100644
--- a/glance/tests/functional/v1/test_ssl.py
+++ b/glance/tests/functional/v1/test_ssl.py
@@ -30,22 +30,18 @@ If a connection cannot be established, all the test cases are
 skipped.
 """
 
-import ConfigParser
 import datetime
 import hashlib
-import httplib
 import httplib2
 import json
 import os
 import tempfile
-import unittest
 
 from glance import client as glance_client
 from glance.common import exception
 from glance.common import utils
-from glance.store.location import get_location_from_uri
 from glance.tests import functional
-from glance.tests.utils import execute, skip_if_disabled, minimal_headers
+from glance.tests.utils import skip_if_disabled, minimal_headers
 
 FIVE_KB = 5 * 1024
 FIVE_GB = 5 * 1024 * 1024 * 1024
diff --git a/glance/tests/functional/v1/test_swift.py b/glance/tests/functional/v1/test_swift.py
index f9dba89ee2..08a02a114f 100644
--- a/glance/tests/functional/v1/test_swift.py
+++ b/glance/tests/functional/v1/test_swift.py
@@ -41,7 +41,6 @@ from glance.store.location import get_location_from_uri
 from glance.tests.functional.v1 import test_api
 from glance.tests.utils import skip_if_disabled, requires, minimal_headers
 from glance.tests.functional.store_utils import (setup_swift,
-                                                 teardown_swift,
                                                  get_swift_uri,
                                                  setup_s3,
                                                  teardown_s3,
diff --git a/glance/tests/stubs.py b/glance/tests/stubs.py
index dba4d7f6bd..42c79a2a8b 100644
--- a/glance/tests/stubs.py
+++ b/glance/tests/stubs.py
@@ -18,7 +18,6 @@
 """Stubouts, mocks and fixtures for the test suite"""
 
 import os
-import shutil
 
 try:
     import sendfile
@@ -32,7 +31,6 @@ from glance.api.middleware import version_negotiation
 from glance.api.v1 import router
 import glance.common.client
 from glance.common import context
-from glance.common import exception
 from glance.registry.api import v1 as rserver
 from glance.tests import utils
 
diff --git a/glance/tests/unit/test_clients.py b/glance/tests/unit/test_clients.py
index e8e71defb2..9c13a0de06 100644
--- a/glance/tests/unit/test_clients.py
+++ b/glance/tests/unit/test_clients.py
@@ -16,25 +16,17 @@
 #    under the License.
 
 import datetime
-import json
 import os
-import StringIO
 import tempfile
 import unittest
 
-import stubout
-import webob
-
 from glance import client
-from glance.common import context
 from glance.common import exception
 from glance.common import utils
 from glance.registry.db import api as db_api
 from glance.registry.db import models as db_models
 from glance.registry import client as rclient
 from glance.registry import context as rcontext
-from glance.tests import stubs
-from glance.tests import utils as test_utils
 from glance.tests.unit import base
 
 CONF = {'sql_connection': 'sqlite://'}
diff --git a/glance/tests/unit/test_context.py b/glance/tests/unit/test_context.py
index 515cc5064f..4e8697661b 100644
--- a/glance/tests/unit/test_context.py
+++ b/glance/tests/unit/test_context.py
@@ -17,8 +17,6 @@
 
 import unittest
 
-import stubout
-
 from glance.registry import context
 
 
diff --git a/glance/tests/unit/test_db.py b/glance/tests/unit/test_db.py
index eaf44d89c0..a3961cb9a8 100644
--- a/glance/tests/unit/test_db.py
+++ b/glance/tests/unit/test_db.py
@@ -19,7 +19,6 @@
 import datetime
 import random
 
-from glance.common import context
 from glance.common import exception
 from glance.common import utils
 from glance.registry import context as rcontext
diff --git a/glance/tests/unit/test_filesystem_store.py b/glance/tests/unit/test_filesystem_store.py
index a75fee8760..8038e854b1 100644
--- a/glance/tests/unit/test_filesystem_store.py
+++ b/glance/tests/unit/test_filesystem_store.py
@@ -20,9 +20,6 @@
 import errno
 import StringIO
 import hashlib
-import unittest
-
-import stubout
 
 from glance.common import exception
 from glance.common import utils
diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py
index a7aff69cea..707ef0c575 100644
--- a/glance/tests/unit/test_image_cache.py
+++ b/glance/tests/unit/test_image_cache.py
@@ -26,7 +26,6 @@ import stubout
 
 from glance import image_cache
 from glance.common import cfg
-from glance.common import exception
 from glance.common import utils
 from glance.tests import utils as test_utils
 from glance.tests.utils import skip_if_disabled, xattr_writes_supported
diff --git a/glance/tests/unit/test_s3_store.py b/glance/tests/unit/test_s3_store.py
index 9adb3afba3..74f1bf14ea 100644
--- a/glance/tests/unit/test_s3_store.py
+++ b/glance/tests/unit/test_s3_store.py
@@ -19,17 +19,14 @@
 
 import StringIO
 import hashlib
-import httplib
-import sys
 import unittest
-import urlparse
 
 import stubout
 import boto.s3.connection
 
 from glance.common import exception
 from glance.common import utils
-from glance.store import BackendException, UnsupportedBackend
+from glance.store import UnsupportedBackend
 from glance.store.location import get_location_from_uri
 from glance.store.s3 import Store, get_s3_location
 from glance.tests import utils as test_utils