A few pep8/pylint cleanups.

cloudinit/mergers/m_dict.py

@@ -46,11 +46,8 @@ class Merger(object):
     def __str__(self):
         s = ('DictMerger: (method=%s,recurse_str=%s,'
              'recurse_dict=%s,recurse_array=%s,allow_delete=%s)')
-        s  = s % (self._method,
-                  self._recurse_str,
-                  self._recurse_dict,
-                  self._recurse_array,
-                  self._allow_delete)
+        s = s % (self._method, self._recurse_str,
+                 self._recurse_dict, self._recurse_array, self._allow_delete)
         return s
 
     def _do_dict_replace(self, value, merge_with, do_replace):

cloudinit/mergers/m_list.py

@@ -47,7 +47,7 @@ class Merger(object):
     def _on_list(self, value, merge_with):
         if (self._method == 'replace' and
             not isinstance(merge_with, (tuple, list))):
-                return merge_with
+            return merge_with
 
         # Ok we now know that what we are merging with is a list or tuple.
         merged_list = []

tests/unittests/test_merging.py

@@ -12,7 +12,7 @@ import os
 import re
 
 SOURCE_PAT = "source*.*yaml"
-EXPECTED_PAT = "expected%s.yaml" 
+EXPECTED_PAT = "expected%s.yaml"
 
 
 def _old_mergedict(src, cand):