summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/str.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-07 16:47:54 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-07 16:47:54 -0500
commitaae7fe638f61aaf02c6579d5b691a8641455c875 (patch)
treeee449987b9076806975802e3843f0305736c3f1b /cloudinit/mergers/str.py
parent9a771ec66f4e79bcd30f7cad7ef4b67e9cc7512d (diff)
downloadvyos-cloud-init-aae7fe638f61aaf02c6579d5b691a8641455c875.tar.gz
vyos-cloud-init-aae7fe638f61aaf02c6579d5b691a8641455c875.zip
fix pep8 and pylint
Diffstat (limited to 'cloudinit/mergers/str.py')
-rw-r--r--cloudinit/mergers/str.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/mergers/str.py b/cloudinit/mergers/str.py
index f1534c5b..291c91c2 100644
--- a/cloudinit/mergers/str.py
+++ b/cloudinit/mergers/str.py
@@ -18,7 +18,7 @@
class Merger(object):
- def __init__(self, merger, opts):
+ def __init__(self, _merger, opts):
self._append = 'append' in opts
# On encountering a unicode object to merge value with