diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 08:56:09 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 08:56:09 -0400 |
| commit | 094ddfe34e6c440c010935db4efa0c90b510d9fa (patch) | |
| tree | fb2b74420049e1edcbfb1c467b8d93c9f6a93d0f /src | |
| parent | ed753bbc124c1530d1705003f4b2c0bfff5e12d4 (diff) | |
| download | bcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.tar.gz bcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.tar.bz2 bcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.zip | |
fixed encoding of Cfg files with unicode contents
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Bcfg2Py3k.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py index 13311f28f..a4441946b 100644 --- a/src/lib/Bcfg2/Bcfg2Py3k.py +++ b/src/lib/Bcfg2/Bcfg2Py3k.py @@ -84,9 +84,9 @@ def u_str(string, encoding=None): return unicode(string) try: - unicode = str -except: unicode = unicode +except: + unicode = str # base64 compat from base64 import b64encode as _b64encode, b64decode as _b64decode diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 7513632f4..5b8dd24d3 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -292,7 +292,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): data = b64encode(data) else: try: - if type(data) != unicode: + if not isinstance(data, unicode): data = u_str(data, self.encoding) except UnicodeDecodeError: msg = "Failed to decode %s: %s" % (entry.get('name'), |