summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/SGenshi.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-04-26 15:18:04 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-04-26 15:18:04 -0500
commitbef2d0c73eb0b3fd071f616aa43a945ae2d103b7 (patch)
tree6b7442075da3d88d649ac9cbe82d6007558e7c8f /src/lib/Server/Plugins/SGenshi.py
parent944df5470f9d30717baccf7b716fd4847b31da27 (diff)
downloadbcfg2-bef2d0c73eb0b3fd071f616aa43a945ae2d103b7.tar.gz
bcfg2-bef2d0c73eb0b3fd071f616aa43a945ae2d103b7.tar.bz2
bcfg2-bef2d0c73eb0b3fd071f616aa43a945ae2d103b7.zip
Plugins: Add full PY3K compatibility
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Plugins/SGenshi.py')
-rw-r--r--src/lib/Server/Plugins/SGenshi.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/SGenshi.py b/src/lib/Server/Plugins/SGenshi.py
index cead06e34..04942c2bd 100644
--- a/src/lib/Server/Plugins/SGenshi.py
+++ b/src/lib/Server/Plugins/SGenshi.py
@@ -23,11 +23,14 @@ class SGenshiTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile):
Bcfg2.Server.Plugins.TGenshi.removecomment)
data = stream.render('xml', strip_whitespace=False)
return lxml.etree.XML(data)
- except LookupError, lerror:
+ except LookupError:
+ lerror = sys.exc_info()[1]
logger.error('Genshi lookup error: %s' % lerror)
- except genshi.template.TemplateError, terror:
+ except genshi.template.TemplateError:
+ terror = sys.exc_info()[1]
logger.error('Genshi template error: %s' % terror)
- except genshi.input.ParseError, perror:
+ except genshi.input.ParseError:
+ perror = sys.exc_info()[1]
logger.error('Genshi parse error: %s' % perror)
raise