From e97eee1d6442f9efcddc42fa2e818420b86a838d Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 13 May 2020 14:46:48 -0400 Subject: [PATCH] cloudinit: remove unneeded __future__ imports We live in the future now. --- cloudinit/config/schema.py | 2 -- cloudinit/serial.py | 2 -- cloudinit/sources/DataSourceMAAS.py | 2 -- cloudinit/tests/helpers.py | 2 -- tests/unittests/test_cs_util.py | 2 -- tests/unittests/test_datasource/test_smartos.py | 2 -- tests/unittests/test_templating.py | 2 -- tests/unittests/test_util.py | 2 -- 8 files changed, 16 deletions(-) diff --git a/cloudinit/config/schema.py b/cloudinit/config/schema.py index a295d63d3ba..7dbe58e233c 100644 --- a/cloudinit/config/schema.py +++ b/cloudinit/config/schema.py @@ -1,8 +1,6 @@ # This file is part of cloud-init. See LICENSE file for license information. """schema.py: Set of module functions for processing cloud-config schema.""" -from __future__ import print_function - from cloudinit import importer from cloudinit.util import find_modules, load_file diff --git a/cloudinit/serial.py b/cloudinit/serial.py index f9ef7acc1c5..67486e09795 100644 --- a/cloudinit/serial.py +++ b/cloudinit/serial.py @@ -1,7 +1,5 @@ # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import absolute_import - try: from serial import Serial except ImportError: diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py index 517913aa233..c80f70c231a 100644 --- a/cloudinit/sources/DataSourceMAAS.py +++ b/cloudinit/sources/DataSourceMAAS.py @@ -6,8 +6,6 @@ # # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import print_function - import hashlib import os import time diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py index b0af54c1768..f3ab7e8c3a6 100644 --- a/cloudinit/tests/helpers.py +++ b/cloudinit/tests/helpers.py @@ -1,7 +1,5 @@ # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import print_function - import functools import httpretty import io diff --git a/tests/unittests/test_cs_util.py b/tests/unittests/test_cs_util.py index 2a1095b9ba5..bfd07ecf9b4 100644 --- a/tests/unittests/test_cs_util.py +++ b/tests/unittests/test_cs_util.py @@ -1,7 +1,5 @@ # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import print_function - from cloudinit.tests import helpers as test_helpers from cloudinit.cs_utils import Cepko diff --git a/tests/unittests/test_datasource/test_smartos.py b/tests/unittests/test_datasource/test_smartos.py index 0f0b42bb528..f1ab1d7aba8 100644 --- a/tests/unittests/test_datasource/test_smartos.py +++ b/tests/unittests/test_datasource/test_smartos.py @@ -12,8 +12,6 @@ ''' -from __future__ import print_function - from binascii import crc32 import json import multiprocessing diff --git a/tests/unittests/test_templating.py b/tests/unittests/test_templating.py index c36e6eb0f5d..cba098302f5 100644 --- a/tests/unittests/test_templating.py +++ b/tests/unittests/test_templating.py @@ -4,8 +4,6 @@ # # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import print_function - from cloudinit.tests import helpers as test_helpers import textwrap diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py index e45bedc1fc7..4b43926765d 100644 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -1,7 +1,5 @@ # This file is part of cloud-init. See LICENSE file for license information. -from __future__ import print_function - import io import json import logging