diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-04-10 10:29:35 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-04-10 10:29:35 -0500 |
| commit | c313bf1d75ae4fa885cd099f299177d84dd8a95d (patch) | |
| tree | 151ec1345a0527a0008d583c586ea0fea9f74ec8 /src/lib/Bcfg2/Server/Plugins/Cfg | |
| parent | 2cb245f4ebf5dbd37f11f02a7d1598b050799515 (diff) | |
| download | bcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.tar.gz bcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.tar.bz2 bcfg2-c313bf1d75ae4fa885cd099f299177d84dd8a95d.zip | |
PY3K: Fix client/server to work with python 3
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 926172e57..ffe93c25b 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -599,6 +599,8 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet, else: try: if not isinstance(data, unicode): + if not isinstance(data, str): + data = data.decode('utf-8') data = u_str(data, self.encoding) except UnicodeDecodeError: msg = "Failed to decode %s: %s" % (entry.get('name'), |