Merge "Stop to use the __future__ module."

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

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

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)

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
 

glance/common/wsgi.py

@@ -19,7 +19,6 @@
 """
 Utility methods for working with WSGI servers
 """
-from __future__ import print_function
 
 import abc
 import errno

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

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

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

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

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

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

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

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