summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_str.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-08-10 09:06:15 -0600
committerScott Moser <smoser@ubuntu.com>2016-08-10 09:06:15 -0600
commitc3c3dc693c14175e110b5fe125d4d5f98ace9700 (patch)
tree8858702c2c8a6ad4bf1bb861a4565e0a9c28e588 /cloudinit/mergers/m_str.py
parent5bd3493d732e5b1902872958e8681f17cbc81ce5 (diff)
downloadcloud-init-trunk.tar.gz
README: Mention move of revision control to git.HEADtrunk
cloud-init development has moved its revision control to git. It is available at https://code.launchpad.net/cloud-init Clone with git clone https://git.launchpad.net/cloud-init or git clone git+ssh://git.launchpad.net/cloud-init For more information see https://git.launchpad.net/cloud-init/tree/HACKING.rst
Diffstat (limited to 'cloudinit/mergers/m_str.py')
-rw-r--r--cloudinit/mergers/m_str.py46
1 files changed, 0 insertions, 46 deletions
diff --git a/cloudinit/mergers/m_str.py b/cloudinit/mergers/m_str.py
deleted file mode 100644
index b00c4bf3..00000000
--- a/cloudinit/mergers/m_str.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-# vi: ts=4 expandtab
-#
-# Copyright (C) 2012 Yahoo! Inc.
-#
-# Author: Joshua Harlow <harlowja@yahoo-inc.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import six
-
-
-class Merger(object):
- def __init__(self, _merger, opts):
- self._append = 'append' in opts
-
- def __str__(self):
- return 'StringMerger: (append=%s)' % (self._append)
-
- # 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 isinstance(value, six.string_types):
- return merge_with
- if not self._append:
- return merge_with
- if isinstance(value, six.text_type):
- return value + six.text_type(merge_with)
- else:
- return value + six.binary_type(merge_with)