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/TCheetah.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/TCheetah.py')
-rw-r--r-- | src/lib/Server/Plugins/TCheetah.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index ec82f5753..e2b4d370d 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -9,10 +9,11 @@ logger = logging.getLogger('Bcfg2.Plugins.TCheetah') class TemplateFile: '''Template file creates Cheetah template structures for the loaded file''' - def __init__(self, name, properties, specific): + def __init__(self, name, properties, specific, encoding): self.name = name self.properties = properties self.specific = specific + self.encoding = encoding self.template = None def handle_event(self, event): @@ -34,7 +35,11 @@ class TemplateFile: self.template.path = entry.get('realname', entry.get('name')) try: - entry.text = str(self.template) + if type(self.template) == unicode: + entry.text = self.template + else : + logger.debug("Override encoding of template to %s" % self.encoding) + entry.text = unicode(str(self.template), self.encoding) except: (a, b, c) = sys.exc_info() msg = traceback.format_exception(a, b, c, limit=2)[-1][:-1] |