diff --git a/glance/api/common.py b/glance/api/common.py index 38449cce44..2e077a56be 100644 --- a/glance/api/common.py +++ b/glance/api/common.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import errno - from glance.common import exception from glance.openstack.common import log as logging diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py index d35946de24..f7a6758adb 100644 --- a/glance/api/middleware/cache.py +++ b/glance/api/middleware/cache.py @@ -32,7 +32,6 @@ from glance.api.v1 import images from glance.common import exception from glance.common import utils from glance.common import wsgi -import glance.db from glance import image_cache import glance.openstack.common.log as logging from glance import registry diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py index cac9ce25a1..265f6c917d 100644 --- a/glance/api/v2/images.py +++ b/glance/api/v2/images.py @@ -22,7 +22,6 @@ import urllib import webob.exc from glance.api import policy -import glance.api.v2 as v2 from glance.common import exception from glance.common import utils from glance.common import wsgi diff --git a/glance/common/client.py b/glance/common/client.py index 4425bb8fe5..c78a641406 100644 --- a/glance/common/client.py +++ b/glance/common/client.py @@ -25,7 +25,6 @@ import functools import httplib import os import re -import select import urllib import urlparse diff --git a/glance/common/utils.py b/glance/common/utils.py index b914a1442e..cf5b72ce40 100644 --- a/glance/common/utils.py +++ b/glance/common/utils.py @@ -32,9 +32,7 @@ import os import platform import subprocess import sys -import uuid -import iso8601 from webob import exc from glance.common import exception diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py index 75d7dfc635..66b5645f19 100644 --- a/glance/common/wsgi.py +++ b/glance/common/wsgi.py @@ -40,7 +40,6 @@ import webob.dec import webob.exc from glance.common import exception -from glance.common import utils from glance.openstack.common import cfg import glance.openstack.common.log as os_logging diff --git a/glance/store/location.py b/glance/store/location.py index 525ff3b165..b56187584b 100644 --- a/glance/store/location.py +++ b/glance/store/location.py @@ -42,7 +42,6 @@ credentials and is **not** user-facing. import urlparse from glance.common import exception -from glance.common import utils import glance.openstack.common.log as logging LOG = logging.getLogger(__name__) diff --git a/glance/store/rbd.py b/glance/store/rbd.py index 8330ff2308..554517a8a6 100644 --- a/glance/store/rbd.py +++ b/glance/store/rbd.py @@ -23,7 +23,6 @@ from __future__ import with_statement import hashlib import math import urllib -import urlparse from glance.common import exception from glance.openstack.common import cfg diff --git a/glance/store/scrubber.py b/glance/store/scrubber.py index 4d9755176d..e4c744581c 100644 --- a/glance/store/scrubber.py +++ b/glance/store/scrubber.py @@ -26,10 +26,6 @@ from glance.openstack.common import cfg import glance.openstack.common.log as logging from glance import registry from glance import store -import glance.store.filesystem -import glance.store.http -import glance.store.s3 -import glance.store.swift LOG = logging.getLogger(__name__) diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index 46468219b9..da34e2bc89 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -24,7 +24,6 @@ and spinning down the servers. """ import datetime -import functools import json import os import re diff --git a/glance/tests/functional/v1/test_misc.py b/glance/tests/functional/v1/test_misc.py index 14063b07e4..360fc08ce7 100644 --- a/glance/tests/functional/v1/test_misc.py +++ b/glance/tests/functional/v1/test_misc.py @@ -19,10 +19,9 @@ import hashlib import httplib2 import json import os -import tempfile from glance.tests import functional -from glance.tests.utils import execute, minimal_headers, minimal_add_command +from glance.tests.utils import execute, minimal_headers FIVE_KB = 5 * 1024 FIVE_GB = 5 * 1024 * 1024 * 1024 diff --git a/glance/tests/functional/v1/test_multiprocessing.py b/glance/tests/functional/v1/test_multiprocessing.py index 626c2036cd..9a269c9a86 100644 --- a/glance/tests/functional/v1/test_multiprocessing.py +++ b/glance/tests/functional/v1/test_multiprocessing.py @@ -15,7 +15,6 @@ # License for the specific language governing permissions and limitations # under the License. -import os import time import httplib2 diff --git a/glance/tests/unit/test_http_store.py b/glance/tests/unit/test_http_store.py index 25b356de58..43ea833f52 100644 --- a/glance/tests/unit/test_http_store.py +++ b/glance/tests/unit/test_http_store.py @@ -17,7 +17,6 @@ import stubout -from glance.common import config from glance.common import exception from glance import context from glance.db.sqlalchemy import api as db_api diff --git a/glance/tests/unit/test_s3_store.py b/glance/tests/unit/test_s3_store.py index 9558a5b0c3..b82cd9fdae 100644 --- a/glance/tests/unit/test_s3_store.py +++ b/glance/tests/unit/test_s3_store.py @@ -24,14 +24,12 @@ import boto.s3.connection import stubout from glance.common import exception -from glance.openstack.common import cfg from glance.openstack.common import uuidutils from glance.store.location import get_location_from_uri import glance.store.s3 from glance.store.s3 import Store, get_s3_location from glance.store import UnsupportedBackend from glance.tests.unit import base -from glance.tests import utils as test_utils FAKE_UUID = uuidutils.generate_uuid() diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py index 9966593238..fce9788189 100644 --- a/glance/tests/unit/test_store_location.py +++ b/glance/tests/unit/test_store_location.py @@ -24,7 +24,6 @@ import glance.store.location as location import glance.store.s3 import glance.store.swift from glance.tests.unit import base -from glance.tests import utils class TestStoreLocation(base.StoreClearingUnitTest): diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index a11189a5aa..9425d1355f 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -27,7 +27,6 @@ from sqlalchemy import exc import stubout import webob -import glance.api.middleware.context as context_middleware import glance.api.common from glance.api.v1 import images from glance.api.v1 import router diff --git a/glance/tests/unit/v2/test_image_tags_resource.py b/glance/tests/unit/v2/test_image_tags_resource.py index 6381cde7f0..cf23d98e19 100644 --- a/glance/tests/unit/v2/test_image_tags_resource.py +++ b/glance/tests/unit/v2/test_image_tags_resource.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import json - import webob import glance.api.v2.image_tags