cloudinit: replace "from six import X" imports (except in util.py) (#183)

7 files changed, 7 insertions, 13 deletions

diff --git a/cloudinit/config/cc_debug.py b/cloudinit/config/cc_debug.py
index 610dbc8b..4d5a6aa2 100644
--- a/cloudinit/config/cc_debug.py
+++ b/cloudinit/config/cc_debug.py
@@ -28,8 +28,7 @@ location that this cloud-init has been configured with when running.
 """
 
 import copy
-
-from six import StringIO
+from io import StringIO
 
 from cloudinit import type_utils
 from cloudinit import util
diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py
index eaf1e940..a9c04d86 100644
--- a/cloudinit/config/cc_landscape.py
+++ b/cloudinit/config/cc_landscape.py
@@ -56,8 +56,7 @@ The following default client config is provided, but can be overridden::
 """
 
 import os
-
-from six import BytesIO
+from io import BytesIO
 
 from configobj import ConfigObj
 
diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py
index b088db6e..c01f5b8f 100644
--- a/cloudinit/config/cc_puppet.py
+++ b/cloudinit/config/cc_puppet.py
@@ -77,11 +77,10 @@ See https://puppet.com/docs/puppet/latest/config_file_csr_attributes.html
                 pp_preshared_key: 342thbjkt82094y0uthhor289jnqthpc2290
 """
 
-from six import StringIO
-
 import os
 import socket
 import yaml
+from io import StringIO
 
 from cloudinit import helpers
 from cloudinit import util
diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py
index bd8ee89f..a5aca038 100644
--- a/cloudinit/config/cc_rightscale_userdata.py
+++ b/cloudinit/config/cc_rightscale_userdata.py
@@ -50,13 +50,12 @@ user scripts configuration directory, to be run later by ``cc_scripts_user``.
 #
 
 import os
+from urllib.parse import parse_qs
 
 from cloudinit.settings import PER_INSTANCE
 from cloudinit import url_helper as uhelp
 from cloudinit import util
 
-from six.moves.urllib_parse import parse_qs
-
 frequency = PER_INSTANCE
 
 MY_NAME = "cc_rightscale_userdata"
diff --git a/cloudinit/config/cc_seed_random.py b/cloudinit/config/cc_seed_random.py
index a5d7c73f..b65f3ed9 100644
--- a/cloudinit/config/cc_seed_random.py
+++ b/cloudinit/config/cc_seed_random.py
@@ -61,8 +61,7 @@ used::
 
 import base64
 import os
-
-from six import BytesIO
+from io import BytesIO
 
 from cloudinit import log as logging
 from cloudinit.settings import PER_INSTANCE
diff --git a/cloudinit/config/cc_zypper_add_repo.py b/cloudinit/config/cc_zypper_add_repo.py
index aba26952..05855b0c 100644
--- a/cloudinit/config/cc_zypper_add_repo.py
+++ b/cloudinit/config/cc_zypper_add_repo.py
@@ -7,7 +7,6 @@
 
 import configobj
 import os
-from six import string_types
 from textwrap import dedent
 
 from cloudinit.config.schema import get_schema_doc
@@ -110,7 +109,7 @@ def _format_repo_value(val):
         return 1 if val else 0
     if isinstance(val, (list, tuple)):
         return "\n    ".join([_format_repo_value(v) for v in val])
-    if not isinstance(val, string_types):
+    if not isinstance(val, str):
         return str(val)
     return val
 
diff --git a/cloudinit/config/tests/test_snap.py b/cloudinit/config/tests/test_snap.py
index 3c472891..cbbb173d 100644
--- a/cloudinit/config/tests/test_snap.py
+++ b/cloudinit/config/tests/test_snap.py
@@ -1,7 +1,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
 import re
-from six import StringIO
+from io import StringIO
 
 from cloudinit.config.cc_snap import (
     ASSERTIONS_FILE, add_assertions, handle, maybe_install_squashfuse,