x/cloud-init
Code Issues Proposed changes

A few pep8/pylint cleanups.

Browse Source
This commit is contained in:
Joshua Harlow 2013-05-03 15:05:45 -07:00
parent 48b6408101
commit 698a9897e3
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cloudinit/mergers/m_dict.py
View File

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

2
cloudinit/mergers/m_list.py
View File

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