Merge "Remove future imports"

Author: Zuul

nova/cmd/common.py

@@ -17,8 +17,6 @@
     Common functions used by different CLI interfaces.
 """
 
-from __future__ import print_function
-
 import argparse
 import traceback
 

nova/cmd/manage.py

@@ -21,8 +21,6 @@
   CLI interface for nova management.
 """
 
-from __future__ import print_function
-
 import collections
 import functools
 import re

nova/cmd/status.py

@@ -16,8 +16,6 @@
 CLI interface for nova status commands.
 """
 
-from __future__ import print_function
-
 import collections
 import functools
 import sys

nova/crypto.py

@@ -19,8 +19,6 @@
 Includes root and intermediate CAs, SSH key_pairs and x509 certificates.
 """
 
-from __future__ import absolute_import
-
 import base64
 import binascii
 import os

nova/image/glance.py

@@ -15,8 +15,6 @@
 
 """Implementation of an image service that uses Glance as the backend."""
 
-from __future__ import absolute_import
-
 import copy
 import inspect
 import itertools

nova/tests/fixtures.py

@@ -15,8 +15,6 @@
 #    under the License.
 
 """Fixtures for Nova tests."""
-from __future__ import absolute_import
-
 import collections
 from contextlib import contextmanager
 import copy

nova/tests/functional/api_paste_fixture.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
-
 import os
 
 import fixtures

nova/tests/functional/fixtures.py

@@ -11,8 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 """Fixtures solely for functional tests."""
-from __future__ import absolute_import
-
 import fixtures
 from keystoneauth1 import adapter as ka
 from keystoneauth1 import session as ks

nova/tests/functional/test_compute_mgr.py

@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import absolute_import
-
 import fixtures
 import mock
 

nova/tests/functional/test_metadata.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
-
 import fixtures
 import jsonschema
 import os

nova/tests/functional/test_nova_manage.py

@@ -9,8 +9,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
-
 import collections
 import mock
 

nova/tests/functional/test_servers.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
-
 import collections
 import copy
 import datetime

nova/tests/unit/virt/powervm/disk/test_ssp.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import absolute_import
-
 import fixtures
 import mock
 from oslo_utils import uuidutils

nova/tests/unit/virt/powervm/test_driver.py

@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import absolute_import
 import contextlib
 
 import fixtures

nova/tests/unit/virt/powervm/test_media.py

@@ -14,8 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import absolute_import
-
 import fixtures
 import mock
 from oslo_utils.fixture import uuidsentinel

nova/tests/unit/virt/powervm/test_vm.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import absolute_import
-
 import fixtures
 import mock
 from pypowervm import exceptions as pvm_exc

nova/wsgi.py

@@ -17,8 +17,6 @@
 
 """Utility methods for working with WSGI servers."""
 
-from __future__ import print_function
-
 import os.path
 import socket
 import ssl

tools/db/schema_diff.py

@@ -42,8 +42,6 @@
 
 """
 
-from __future__ import print_function
-
 import datetime
 import glob
 import os