diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-05 19:16:01 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-05 19:16:01 -0800 |
| commit | 2653a9172e375484b4d0a88c3de56334136fa134 (patch) | |
| tree | 0cdf8798216e5c6e5a57631a0b7acac8a2a7379f /cloudinit/mergers/str.py | |
| parent | 9d91b156e4e81d07eb2f01946cea17c7565b7fc4 (diff) | |
| download | vyos-cloud-init-2653a9172e375484b4d0a88c3de56334136fa134.tar.gz vyos-cloud-init-2653a9172e375484b4d0a88c3de56334136fa134.zip | |
Add in a bunch of changes and tests.
Diffstat (limited to 'cloudinit/mergers/str.py')
| -rw-r--r-- | cloudinit/mergers/str.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloudinit/mergers/str.py b/cloudinit/mergers/str.py index 14bc46ec..f1534c5b 100644 --- a/cloudinit/mergers/str.py +++ b/cloudinit/mergers/str.py @@ -21,9 +21,14 @@ class Merger(object): def __init__(self, merger, opts): self._append = 'append' in opts + # On encountering a unicode object to merge value with + # we will for now just proxy into the string method to let it handle it. def _on_unicode(self, value, merge_with): return self._on_str(value, merge_with) + # On encountering a string object to merge with we will + # perform the following action, if appending we will + # merge them together, otherwise we will just return value. def _on_str(self, value, merge_with): if not self._append: return value |
