summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-05-14 11:25:02 -0400
committerGitHub <noreply@github.com>2020-05-14 11:25:02 -0400
commit4261ae538563d262bc76b8c55f7cc0c8abb14b00 (patch)
treea6611d0c392a165af434ba2185a83cb1b84b734a
parentb73b319094b133bf47038ab41f29cc9507bdc5bd (diff)
downloadvyos-cloud-init-4261ae538563d262bc76b8c55f7cc0c8abb14b00.tar.gz
vyos-cloud-init-4261ae538563d262bc76b8c55f7cc0c8abb14b00.zip
cloudinit: remove unneeded __future__ imports (#362)
We live in the future now.
-rw-r--r--cloudinit/config/schema.py2
-rw-r--r--cloudinit/serial.py2
-rw-r--r--cloudinit/sources/DataSourceMAAS.py2
-rw-r--r--cloudinit/tests/helpers.py2
-rw-r--r--tests/unittests/test_cs_util.py2
-rw-r--r--tests/unittests/test_datasource/test_smartos.py2
-rw-r--r--tests/unittests/test_templating.py2
-rw-r--r--tests/unittests/test_util.py2
8 files changed, 0 insertions, 16 deletions
diff --git a/cloudinit/config/schema.py b/cloudinit/config/schema.py
index da00060a..2d8c7577 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 f9ef7acc..67486e09 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 517913aa..c80f70c2 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 b0af54c1..f3ab7e8c 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 2a1095b9..bfd07ecf 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 0f0b42bb..f1ab1d7a 100644
--- a/tests/unittests/test_datasource/test_smartos.py
+++ b/tests/unittests/test_datasource/test_smartos.py
@@ -12,8 +12,6 @@ order to validate return responses.
'''
-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 c36e6eb0..cba09830 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 e45bedc1..4b439267 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