From 1515a229e341c927eaf30e73237edce71719d534 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 24 Mar 2020 15:05:36 +0000 Subject: [PATCH] Remove future imports These particular imports are no longer needed in a Python 3-only world. Change-Id: Ia1b60ce238713b86f126e2d404199d102fdbc5bc Signed-off-by: Stephen Finucane --- nova/cmd/common.py | 2 -- nova/cmd/manage.py | 2 -- nova/cmd/status.py | 2 -- nova/crypto.py | 2 -- nova/image/glance.py | 2 -- nova/tests/fixtures.py | 2 -- nova/tests/functional/api_paste_fixture.py | 2 -- nova/tests/functional/fixtures.py | 2 -- nova/tests/functional/test_compute_mgr.py | 2 -- nova/tests/functional/test_metadata.py | 2 -- nova/tests/functional/test_nova_manage.py | 2 -- nova/tests/functional/test_servers.py | 2 -- nova/tests/unit/virt/powervm/disk/test_ssp.py | 2 -- nova/tests/unit/virt/powervm/test_driver.py | 1 - nova/tests/unit/virt/powervm/test_media.py | 2 -- nova/tests/unit/virt/powervm/test_vm.py | 2 -- nova/wsgi.py | 2 -- tools/db/schema_diff.py | 2 -- 18 files changed, 35 deletions(-) diff --git a/nova/cmd/common.py b/nova/cmd/common.py index ab7b7c3ca20..c4302e5a967 100644 --- a/nova/cmd/common.py +++ b/nova/cmd/common.py @@ -17,8 +17,6 @@ Common functions used by different CLI interfaces. """ -from __future__ import print_function - import argparse import traceback diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 2e4e135ee0d..e90246edd1e 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -21,8 +21,6 @@ CLI interface for nova management. """ -from __future__ import print_function - import collections import functools import re diff --git a/nova/cmd/status.py b/nova/cmd/status.py index f9e1319c1ab..3c9c15fb3ff 100644 --- a/nova/cmd/status.py +++ b/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 diff --git a/nova/crypto.py b/nova/crypto.py index 5b96a0ef4b9..f195bce4fa5 100644 --- a/nova/crypto.py +++ b/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 diff --git a/nova/image/glance.py b/nova/image/glance.py index 5ed0d59d300..91a3c77b01c 100644 --- a/nova/image/glance.py +++ b/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 diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index ce66ddb7741..609fbd95f36 100644 --- a/nova/tests/fixtures.py +++ b/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 diff --git a/nova/tests/functional/api_paste_fixture.py b/nova/tests/functional/api_paste_fixture.py index 5c268c73070..598b00f7517 100644 --- a/nova/tests/functional/api_paste_fixture.py +++ b/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 diff --git a/nova/tests/functional/fixtures.py b/nova/tests/functional/fixtures.py index 0a56bab4be7..9a05aa9bb09 100644 --- a/nova/tests/functional/fixtures.py +++ b/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 diff --git a/nova/tests/functional/test_compute_mgr.py b/nova/tests/functional/test_compute_mgr.py index 151980ab888..d6ca94b5c42 100644 --- a/nova/tests/functional/test_compute_mgr.py +++ b/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 diff --git a/nova/tests/functional/test_metadata.py b/nova/tests/functional/test_metadata.py index f29e0402137..bc5b680a2cd 100644 --- a/nova/tests/functional/test_metadata.py +++ b/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 diff --git a/nova/tests/functional/test_nova_manage.py b/nova/tests/functional/test_nova_manage.py index 811224e96ec..542b4f47847 100644 --- a/nova/tests/functional/test_nova_manage.py +++ b/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 diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py index ba83dc4f15b..43364ad962b 100644 --- a/nova/tests/functional/test_servers.py +++ b/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 diff --git a/nova/tests/unit/virt/powervm/disk/test_ssp.py b/nova/tests/unit/virt/powervm/disk/test_ssp.py index 6e83640b1c0..86705dc29b8 100644 --- a/nova/tests/unit/virt/powervm/disk/test_ssp.py +++ b/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 diff --git a/nova/tests/unit/virt/powervm/test_driver.py b/nova/tests/unit/virt/powervm/test_driver.py index 53cf89cbed0..25e99cd4b68 100644 --- a/nova/tests/unit/virt/powervm/test_driver.py +++ b/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 diff --git a/nova/tests/unit/virt/powervm/test_media.py b/nova/tests/unit/virt/powervm/test_media.py index fe1d7efeec2..f98769e0dee 100644 --- a/nova/tests/unit/virt/powervm/test_media.py +++ b/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 diff --git a/nova/tests/unit/virt/powervm/test_vm.py b/nova/tests/unit/virt/powervm/test_vm.py index d9d6e88bce1..ab0f9c35e83 100644 --- a/nova/tests/unit/virt/powervm/test_vm.py +++ b/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 diff --git a/nova/wsgi.py b/nova/wsgi.py index 07021f16c3f..e9fb7500320 100644 --- a/nova/wsgi.py +++ b/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 diff --git a/tools/db/schema_diff.py b/tools/db/schema_diff.py index bb389532f05..b309d26725c 100755 --- a/tools/db/schema_diff.py +++ b/tools/db/schema_diff.py @@ -42,8 +42,6 @@ """ -from __future__ import print_function - import datetime import glob import os