3 files changed, 4 insertions, 7 deletions
diff --git a/cloudinit/config/cc_apt_pipelining.py b/cloudinit/config/cc_apt_pipelining.py
index e5629175..40c32c84 100644
--- a/cloudinit/config/cc_apt_pipelining.py
+++ b/cloudinit/config/cc_apt_pipelining.py
@@ -43,7 +43,7 @@ def handle(_name, cfg, _cloud, log, _args):
         write_apt_snippet("0", log, DEFAULT_FILE)
     elif apt_pipe_value_s in ("none", "unchanged", "os"):
         return
-    elif apt_pipe_value_s in [str(b) for b in xrange(0, 6)]:
+    elif apt_pipe_value_s in [str(b) for b in range(0, 6)]:
         write_apt_snippet(apt_pipe_value_s, log, DEFAULT_FILE)
     else:
         log.warn("Invalid option for apt_pipeling: %s", apt_pipe_value)
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index f899210b..e2ce6db4 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -304,8 +304,7 @@ def is_disk_used(device):
 
     # If the child count is higher 1, then there are child nodes
     # such as partition or device mapper nodes
-    use_count = [x for x in enumerate_disk(device)]
-    if len(use_count.splitlines()) > 1:
+    if len(list(enumerate_disk(device))) > 1:
         return True
 
     # If we see a file system, then its used
diff --git a/cloudinit/config/cc_snappy.py b/cloudinit/config/cc_snappy.py
index 6a7ae09b..7aaec94a 100644
--- a/cloudinit/config/cc_snappy.py
+++ b/cloudinit/config/cc_snappy.py
@@ -42,12 +42,10 @@ Example config:
 """
 
 from cloudinit import log as logging
-from cloudinit import templater
 from cloudinit import util
 from cloudinit.settings import PER_INSTANCE
 
 import glob
-import six
 import tempfile
 import os
 
@@ -72,7 +70,7 @@ def parse_filename(fname):
     name = fname_noext.partition("_")[0]
     shortname = name.partition(".")[0]
     return(name, shortname, fname_noext)
-    
+
 
 def get_fs_package_ops(fspath):
     if not fspath:
@@ -98,7 +96,7 @@ def makeop(op, name, config=None, path=None, cfgfile=None):
 
 def get_package_config(configs, name):
     # load the package's config from the configs dict.
-    # prefer full-name entry (config-example.canonical) 
+    # prefer full-name entry (config-example.canonical)
     # over short name entry (config-example)
     if name in configs:
         return configs[name]