diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
| commit | 90c85147bacea14771abf8faa1fc5f185418d14b (patch) | |
| tree | b10e06fc80ed714f5376b169e32b8953479211f1 /src/lib/Server/Plugins/SGenshi.py | |
| parent | 4f3da4543ec4e8c3c4776ae2ee3611e47ce78525 (diff) | |
| parent | ce6a228d33ace4136dc2b5388c64795dfbd26ffb (diff) | |
| download | bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.gz bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.bz2 bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.zip | |
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'src/lib/Server/Plugins/SGenshi.py')
| -rw-r--r-- | src/lib/Server/Plugins/SGenshi.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/SGenshi.py b/src/lib/Server/Plugins/SGenshi.py index cead06e34..efd981956 100644 --- a/src/lib/Server/Plugins/SGenshi.py +++ b/src/lib/Server/Plugins/SGenshi.py @@ -5,6 +5,7 @@ import genshi.input import genshi.template import lxml.etree import logging +import sys import Bcfg2.Server.Plugin import Bcfg2.Server.Plugins.TGenshi @@ -23,11 +24,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 |