summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-04-18 14:15:37 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-04-18 14:15:37 -0700
commit50f91a1bca166b5e815a722aca573672b269bacb (patch)
tree040e01df6829b9a676e9f54c0b337722fc71df4e /cloudinit/mergers
parentd6cfa558c060d3e19073cc569590afc9a2f1b9ff (diff)
downloadvyos-cloud-init-50f91a1bca166b5e815a722aca573672b269bacb.tar.gz
vyos-cloud-init-50f91a1bca166b5e815a722aca573672b269bacb.zip
Remove str merging for now.
Diffstat (limited to 'cloudinit/mergers')
-rw-r--r--cloudinit/mergers/__init__.py2
-rw-r--r--cloudinit/mergers/m_str.py39
2 files changed, 1 insertions, 40 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py
index f504e15f..2702496b 100644
--- a/cloudinit/mergers/__init__.py
+++ b/cloudinit/mergers/__init__.py
@@ -25,7 +25,7 @@ from cloudinit import type_utils
NAME_MTCH = re.compile(r"(^[a-zA-Z_][A-Za-z0-9_]*)\((.*?)\)$")
LOG = logging.getLogger(__name__)
-DEF_MERGE_TYPE = "list()+dict()+str()"
+DEF_MERGE_TYPE = "list()+dict()"
MERGER_PREFIX = 'm_'
MERGER_ATTR = 'Merger'
diff --git a/cloudinit/mergers/m_str.py b/cloudinit/mergers/m_str.py
deleted file mode 100644
index a0c57b53..00000000
--- a/cloudinit/mergers/m_str.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/>.
-
-
-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 merge_with
- else:
- if isinstance(value, (unicode)):
- return value + unicode(merge_with)
- else:
- return value + str(merge_with)