diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 15:05:45 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 15:05:45 -0700 |
| commit | 9a1584b701cecbbba4a9371542114bcc806ec596 (patch) | |
| tree | c293dcc8eea656f8d39b37d958794115b053eae2 /cloudinit/mergers/m_list.py | |
| parent | 5118a33b22a376954bd048c3142f2d3f7f55d003 (diff) | |
| download | vyos-cloud-init-9a1584b701cecbbba4a9371542114bcc806ec596.tar.gz vyos-cloud-init-9a1584b701cecbbba4a9371542114bcc806ec596.zip | |
A few pep8/pylint cleanups.
Diffstat (limited to 'cloudinit/mergers/m_list.py')
| -rw-r--r-- | cloudinit/mergers/m_list.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/mergers/m_list.py b/cloudinit/mergers/m_list.py index 34b32379..8a0b5827 100644 --- a/cloudinit/mergers/m_list.py +++ b/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 = [] |