From c2353e78958419abcc490b619e2f11f450984318 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 22 Sep 2009 22:17:15 +0000 Subject: TGenshi: Ensure backward/forward api compatibility for genshi git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5448 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/TGenshi.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/lib/Server/Plugins/TGenshi.py') diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py index 0d56f0189..4bec8b2f1 100644 --- a/src/lib/Server/Plugins/TGenshi.py +++ b/src/lib/Server/Plugins/TGenshi.py @@ -72,13 +72,19 @@ class TemplateFile: else: ttypes = [TextTemplate] if True in [isinstance(self.template, t) for t in ttypes]: - textdata = stream.render('text', strip_whitespace=False) + try: + textdata = stream.render('text', strip_whitespace=False) + except TypeError: + textdata = stream.render('text') if type(textdata) == unicode: entry.text = textdata else: entry.text = unicode(textdata, self.encoding) else: - xmldata = stream.render('xml', strip_whitespace=False) + try: + xmldata = stream.render('xml', strip_whitespace=False) + except TypeError: + xmldata = stream.render('xml') if type(xmldata) == unicode: entry.text = xmldata else: -- cgit v1.2.3-1-g7c22