diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 07:25:07 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 08:31:06 -0400 |
| commit | ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d (patch) | |
| tree | c9ec96afeb1066c6ec4a2780a12a39349b213374 /src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | |
| parent | d065f384846867fbee14be74209a1e56436314e8 (diff) | |
| download | bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.tar.gz bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.tar.bz2 bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.zip | |
merged cheetah encoding fixes from maint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index aef239fce..7513632f4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -9,7 +9,7 @@ import logging import lxml.etree import Bcfg2.Options import Bcfg2.Server.Plugin -from Bcfg2.Bcfg2Py3k import u_str, b64encode +from Bcfg2.Bcfg2Py3k import u_str, unicode, b64encode import Bcfg2.Server.Lint logger = logging.getLogger(__name__) @@ -292,7 +292,8 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): data = b64encode(data) else: try: - data = u_str(data, self.encoding) + if type(data) != unicode: + data = u_str(data, self.encoding) except UnicodeDecodeError: msg = "Failed to decode %s: %s" % (entry.get('name'), sys.exc_info()[1]) |