diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2008-06-30 15:59:01 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2008-06-30 15:59:01 +0000 |
| commit | e32bbfbca5233d4ad7a5bee74698d614ff0b1f24 (patch) | |
| tree | 5f6b08da35732532f2b3d8761bd7f26a61ce8aab /src/lib/Server/Plugins/Cfg.py | |
| parent | 477603f8f0680f40781559ec1cee8f85c2d76913 (diff) | |
| download | bcfg2-e32bbfbca5233d4ad7a5bee74698d614ff0b1f24.tar.gz bcfg2-e32bbfbca5233d4ad7a5bee74698d614ff0b1f24.tar.bz2 bcfg2-e32bbfbca5233d4ad7a5bee74698d614ff0b1f24.zip | |
Unicode support (from stousignant) (Resolves Ticket #549)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4731 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 80c9d7467..5f3f1688b 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -49,8 +49,8 @@ class CfgMatcher: return self.basefile_reg.match(fname) class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): - def __init__(self, basename, path, props, entry_type): - Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path, props, entry_type) + def __init__(self, basename, path, props, entry_type, encoding): + Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path, props, entry_type, encoding) self.specific = CfgMatcher(path.split('/')[-1]) def sort_by_specific(self, one, other): @@ -79,7 +79,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): if entry.get('encoding') == 'base64': entry.text = binascii.b2a_base64(data) else: - entry.text = data + entry.text = unicode(data, self.encoding) if entry.text in ['', None]: entry.set('empty', 'true') |