diff options
| author | Jay Faulkner <jay@jvf.cc> | 2014-08-26 11:50:11 -0700 |
|---|---|---|
| committer | Jay Faulkner <jay@jvf.cc> | 2014-08-26 11:50:11 -0700 |
| commit | b3216b56f3fea3259c290faa2dd496215b625904 (patch) | |
| tree | b88edfcb8819f27a5189891236f2edeb3b859350 /cloudinit/mergers | |
| parent | 190cacc430900d9d2dd4dd45c59d01e30e469720 (diff) | |
| download | cloud-init-git-b3216b56f3fea3259c290faa2dd496215b625904.tar.gz | |
fix(pep8): Fix various pep8 violations and version-lock pep8
Fixed all complaints from running "make pep8". Also version locked
pep8 in test-requirements.txt to ensure that pep8 requirements don't
change without an explicit commit.
Diffstat (limited to 'cloudinit/mergers')
| -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. |