diff --git a/glance/cmd/cache_manage.py b/glance/cmd/cache_manage.py index 23f7e982d6..f7f3968aff 100644 --- a/glance/cmd/cache_manage.py +++ b/glance/cmd/cache_manage.py @@ -18,7 +18,6 @@ """ A simple cache management utility for Glance. """ -from __future__ import print_function import argparse import collections diff --git a/glance/cmd/control.py b/glance/cmd/control.py index 6365c8387b..644a01c5a8 100644 --- a/glance/cmd/control.py +++ b/glance/cmd/control.py @@ -18,9 +18,6 @@ Helper script for starting/stopping/reloading Glance server programs. Thanks for some of the code, Swifties ;) """ -from __future__ import print_function -from __future__ import with_statement - import argparse import fcntl import os diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index a519092168..e7af21acf6 100644 --- a/glance/cmd/manage.py +++ b/glance/cmd/manage.py @@ -21,8 +21,6 @@ Glance Management Utility """ -from __future__ import print_function - # FIXME(sirp): When we have glance-admin we can consider merging this into it # Perhaps for consistency with Nova, we would then rename glance-admin -> # glance-manage (or the other way around) diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py index f2d2ae6b1f..e8fd47c711 100644 --- a/glance/cmd/replicator.py +++ b/glance/cmd/replicator.py @@ -16,8 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function - import os import sys diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py index 8f947be6ad..60971ad986 100644 --- a/glance/common/wsgi.py +++ b/glance/common/wsgi.py @@ -19,7 +19,6 @@ """ Utility methods for working with WSGI servers """ -from __future__ import print_function import abc import errno diff --git a/glance/db/sqlalchemy/alembic_migrations/env.py b/glance/db/sqlalchemy/alembic_migrations/env.py index 554aa5a943..a474009e8a 100644 --- a/glance/db/sqlalchemy/alembic_migrations/env.py +++ b/glance/db/sqlalchemy/alembic_migrations/env.py @@ -12,8 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from __future__ import with_statement from logging import config as log_config from alembic import context diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py index 4bed3c753d..1fe6d10539 100644 --- a/glance/image_cache/drivers/sqlite.py +++ b/glance/image_cache/drivers/sqlite.py @@ -16,8 +16,6 @@ """ Cache driver that uses SQLite to store information about cached images """ - -from __future__ import absolute_import from contextlib import contextmanager import os import sqlite3 diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py index 89a397ddc8..a2e8af907d 100644 --- a/glance/image_cache/drivers/xattr.py +++ b/glance/image_cache/drivers/xattr.py @@ -50,8 +50,6 @@ $image_cache_dir/ invalid/ queue/ """ - -from __future__ import absolute_import from contextlib import contextmanager import errno import os diff --git a/glance/tests/functional/store_utils.py b/glance/tests/functional/store_utils.py index 701bead1c2..fd3275b1c4 100644 --- a/glance/tests/functional/store_utils.py +++ b/glance/tests/functional/store_utils.py @@ -18,8 +18,6 @@ Utility methods to set testcases up for Swift tests. """ -from __future__ import print_function - import threading from oslo_utils import units diff --git a/glance/tests/unit/fixtures.py b/glance/tests/unit/fixtures.py index 420135f93f..e6e48c32c5 100644 --- a/glance/tests/unit/fixtures.py +++ b/glance/tests/unit/fixtures.py @@ -12,7 +12,6 @@ """Fixtures for Glance unit tests.""" # NOTE(mriedem): This is needed for importing from fixtures. -from __future__ import absolute_import import logging as std_logging import os diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py index a98bca696a..5b0896faa0 100644 --- a/glance/tests/unit/test_glance_replicator.py +++ b/glance/tests/unit/test_glance_replicator.py @@ -11,8 +11,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import from unittest import mock import copy diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py index 42535ba8e8..bfdef3d684 100644 --- a/glance/tests/unit/test_image_cache.py +++ b/glance/tests/unit/test_image_cache.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import - from contextlib import contextmanager import datetime import hashlib diff --git a/glance/tests/unit/test_manage.py b/glance/tests/unit/test_manage.py index 882cf36cc9..2ebd2c9b05 100644 --- a/glance/tests/unit/test_manage.py +++ b/glance/tests/unit/test_manage.py @@ -12,8 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import from unittest import mock import fixtures