diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-01-31 10:15:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 10:15:31 -0500 |
| commit | 1bb1896ec900622e02c1ffb59db4d3f2df4a964d (patch) | |
| tree | b1339e806a8682e8fdf8582b83630cf9d20ce04a /cloudinit/cmd | |
| parent | 0ecbd888c9491176ae41bbfa2b74a05234882000 (diff) | |
| download | vyos-cloud-init-1bb1896ec900622e02c1ffb59db4d3f2df4a964d.tar.gz vyos-cloud-init-1bb1896ec900622e02c1ffb59db4d3f2df4a964d.zip | |
cloudinit: replace "from six import X" imports (except in util.py) (#183)
Diffstat (limited to 'cloudinit/cmd')
| -rw-r--r-- | cloudinit/cmd/devel/tests/test_logs.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/devel/tests/test_render.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_clean.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_cloud_id.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_main.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_query.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/tests/test_status.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/cloudinit/cmd/devel/tests/test_logs.py b/cloudinit/cmd/devel/tests/test_logs.py index 4951797b..d2dfa8de 100644 --- a/cloudinit/cmd/devel/tests/test_logs.py +++ b/cloudinit/cmd/devel/tests/test_logs.py @@ -2,7 +2,7 @@ from datetime import datetime import os -from six import StringIO +from io import StringIO from cloudinit.cmd.devel import logs from cloudinit.sources import INSTANCE_JSON_SENSITIVE_FILE diff --git a/cloudinit/cmd/devel/tests/test_render.py b/cloudinit/cmd/devel/tests/test_render.py index 988bba03..a7fcf2ce 100644 --- a/cloudinit/cmd/devel/tests/test_render.py +++ b/cloudinit/cmd/devel/tests/test_render.py @@ -1,7 +1,7 @@ # This file is part of cloud-init. See LICENSE file for license information. -from six import StringIO import os +from io import StringIO from collections import namedtuple from cloudinit.cmd.devel import render diff --git a/cloudinit/cmd/tests/test_clean.py b/cloudinit/cmd/tests/test_clean.py index f092ab3d..13a69aa1 100644 --- a/cloudinit/cmd/tests/test_clean.py +++ b/cloudinit/cmd/tests/test_clean.py @@ -5,7 +5,7 @@ from cloudinit.util import ensure_dir, sym_link, write_file from cloudinit.tests.helpers import CiTestCase, wrap_and_call, mock from collections import namedtuple import os -from six import StringIO +from io import StringIO mypaths = namedtuple('MyPaths', 'cloud_dir') diff --git a/cloudinit/cmd/tests/test_cloud_id.py b/cloudinit/cmd/tests/test_cloud_id.py index 73738170..3f3727fd 100644 --- a/cloudinit/cmd/tests/test_cloud_id.py +++ b/cloudinit/cmd/tests/test_cloud_id.py @@ -4,7 +4,7 @@ from cloudinit import util from collections import namedtuple -from six import StringIO +from io import StringIO from cloudinit.cmd import cloud_id diff --git a/cloudinit/cmd/tests/test_main.py b/cloudinit/cmd/tests/test_main.py index 57b8fdf5..384fddc6 100644 --- a/cloudinit/cmd/tests/test_main.py +++ b/cloudinit/cmd/tests/test_main.py @@ -3,7 +3,7 @@ from collections import namedtuple import copy import os -from six import StringIO +from io import StringIO from cloudinit.cmd import main from cloudinit import safeyaml diff --git a/cloudinit/cmd/tests/test_query.py b/cloudinit/cmd/tests/test_query.py index c48605ad..6d36a4ea 100644 --- a/cloudinit/cmd/tests/test_query.py +++ b/cloudinit/cmd/tests/test_query.py @@ -1,7 +1,7 @@ # This file is part of cloud-init. See LICENSE file for license information. import errno -from six import StringIO +from io import StringIO from textwrap import dedent import os diff --git a/cloudinit/cmd/tests/test_status.py b/cloudinit/cmd/tests/test_status.py index aded8580..1ed10896 100644 --- a/cloudinit/cmd/tests/test_status.py +++ b/cloudinit/cmd/tests/test_status.py @@ -2,7 +2,7 @@ from collections import namedtuple import os -from six import StringIO +from io import StringIO from textwrap import dedent from cloudinit.atomic_helper import write_json |