fix pep8 and pylint

5 files changed, 8 insertions, 7 deletions

diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py
index 47c10a97..8a709677 100644
--- a/cloudinit/config/cc_landscape.py
+++ b/cloudinit/config/cc_landscape.py
@@ -59,7 +59,8 @@ def handle(_name, cfg, cloud, log, _args):
     if not isinstance(ls_cloudcfg, (dict)):
         raise RuntimeError(("'landscape' key existed in config,"
                             " but not a dictionary type,"
-                            " is a %s instead"), type_utils.obj_name(ls_cloudcfg))
+                            " is a %s instead"),
+                           type_utils.obj_name(ls_cloudcfg))
     if not ls_cloudcfg:
         return
 
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 7b6276c5..50d52594 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -741,7 +741,7 @@ def normalize_users_groups(cfg, distro):
             }
         if not isinstance(old_user, (dict)):
             LOG.warn(("Format for 'user' key must be a string or "
-                      "dictionary and not %s"), util.obj_name(old_user))
+                      "dictionary and not %s"), type_utils.obj_name(old_user))
             old_user = {}
 
     # If no old user format, then assume the distro
@@ -767,7 +767,7 @@ def normalize_users_groups(cfg, distro):
     if not isinstance(base_users, (list, dict, str, basestring)):
         LOG.warn(("Format for 'users' key must be a comma separated string"
                   " or a dictionary or a list and not %s"),
-                 util.obj_name(base_users))
+                 type_utils.obj_name(base_users))
         base_users = []
 
     if old_user:
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py
index 3b56686f..ac16f143 100644
--- a/cloudinit/mergers/__init__.py
+++ b/cloudinit/mergers/__init__.py
@@ -32,7 +32,7 @@ class UnknownMerger(object):
     # Named differently so auto-method finding
     # doesn't pick this up if there is ever a type
     # named "unknown"
-    def _handle_unknown(self, meth_wanted, value, merge_with):
+    def _handle_unknown(self, _meth_wanted, value, _merge_with):
         return value
 
     # This merging will attempt to look for a '_on_X' method
@@ -119,7 +119,8 @@ def string_extract_mergers(merge_how):
             continue
         match = NAME_MTCH.match(m_name)
         if not match:
-            msg = "Matcher identifer '%s' is not in the right format" % (m_name)
+            msg = ("Matcher identifer '%s' is not in the right format" %
+                   (m_name))
             raise ValueError(msg)
         (m_name, m_ops) = match.groups()
         m_ops = m_ops.strip().split(",")
diff --git a/cloudinit/mergers/str.py b/cloudinit/mergers/str.py
index f1534c5b..291c91c2 100644
--- a/cloudinit/mergers/str.py
+++ b/cloudinit/mergers/str.py
@@ -18,7 +18,7 @@
 
 
 class Merger(object):
-    def __init__(self, merger, opts):
+    def __init__(self, _merger, opts):
         self._append = 'append' in opts
 
     # On encountering a unicode object to merge value with
diff --git a/cloudinit/sources/DataSourceNone.py b/cloudinit/sources/DataSourceNone.py
index e2175e1f..12a8a992 100644
--- a/cloudinit/sources/DataSourceNone.py
+++ b/cloudinit/sources/DataSourceNone.py
@@ -18,7 +18,6 @@
 
 from cloudinit import log as logging
 from cloudinit import sources
-from cloudinit import util
 
 LOG = logging.getLogger(__name__)