summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/TGenshi.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-02-02 20:18:34 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-02-02 20:18:34 +0000
commitcf9b9d397472cfbbdbf0db47975fc67020860c28 (patch)
tree5dd7fc87bc78fa2cbf12b0ab6c9f902afc2d1d2d /src/lib/Server/Plugins/TGenshi.py
parentcd0f3c4da901ab9cecc0ff1cb73382df425e2c7b (diff)
downloadbcfg2-cf9b9d397472cfbbdbf0db47975fc67020860c28.tar.gz
bcfg2-cf9b9d397472cfbbdbf0db47975fc67020860c28.tar.bz2
bcfg2-cf9b9d397472cfbbdbf0db47975fc67020860c28.zip
Fix unicode error messages
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5057 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/TGenshi.py')
-rw-r--r--src/lib/Server/Plugins/TGenshi.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py
index 40e65b877..3743517a9 100644
--- a/src/lib/Server/Plugins/TGenshi.py
+++ b/src/lib/Server/Plugins/TGenshi.py
@@ -72,16 +72,12 @@ class TemplateFile:
if type(textdata) == unicode:
entry.text = textdata
else:
- if self.encoding != 'ascii':
- logger.debug("Override encoding of %s TGenshi template to %s" % (self.name, self.encoding))
entry.text = unicode(textdata, self.encoding)
else:
xmldata = stream.render('xml')
if type(xmldata) == unicode:
entry.text = xmldata
else:
- if self.encoding != 'ascii':
- logger.debug("Override encoding of %s TGenshi template to %s" % (self.name, self.encoding))
entry.text = unicode(xmldata, self.encoding)
except TemplateError, terror:
logger.error('Genshi template error: %s' % terror)