Remove str merging for now.

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)