diff options
| author | Jay Faulkner <jay@jvf.cc> | 2014-08-26 16:05:58 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-26 16:05:58 -0400 |
| commit | 31f9129c8a77aec8d3eb6fa649d1caa9b6df347e (patch) | |
| tree | 10d634bc7732390c5043bd2ff1a678b5289abb93 /cloudinit/mergers/m_list.py | |
| parent | 190cacc430900d9d2dd4dd45c59d01e30e469720 (diff) | |
| parent | 5fb6482692cfffba5ba45102858b14ba3acc5bc7 (diff) | |
| download | vyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.tar.gz vyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.zip | |
Fix pep8 issues, drop pylint.
pep8: passes on pylint 1.5.7 (and 1.5.6 utopic).
intent is that is to be the target for future changes.
pylint: remove as more hassle than its worth.
Intent is to move to pyflakes at some point.
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 62999b4e..3b87b0fc 100644 --- a/cloudinit/mergers/m_list.py +++ b/cloudinit/mergers/m_list.py @@ -53,7 +53,7 @@ class Merger(object): def _on_list(self, value, merge_with): if (self._method == 'replace' and - not isinstance(merge_with, (tuple, list))): + not isinstance(merge_with, (tuple, list))): return merge_with # Ok we now know that what we are merging with is a list or tuple. |