diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2005-11-28 21:39:04 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2005-11-28 21:39:04 +0000 |
| commit | 7fcb71a1a06b4656b75bfa653b13667506cf5ed7 (patch) | |
| tree | f28c8bb3a00c001d167dd72f5cd74ef21f67a395 /src/lib/Server/Plugins/TCheetah.py | |
| parent | e8246855ff91bb1735f998417e86ee12b3ea65b5 (diff) | |
| download | bcfg2-7fcb71a1a06b4656b75bfa653b13667506cf5ed7.tar.gz bcfg2-7fcb71a1a06b4656b75bfa653b13667506cf5ed7.tar.bz2 bcfg2-7fcb71a1a06b4656b75bfa653b13667506cf5ed7.zip | |
switch to etree errors
(Logical change 1.368)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1552 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/TCheetah.py')
| -rw-r--r-- | src/lib/Server/Plugins/TCheetah.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index 314a5b0ac..f39ebbad0 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -4,8 +4,7 @@ __revision__ = '$Revision$' from posixpath import isdir from syslog import syslog, LOG_ERR from Bcfg2.Server.Plugin import Plugin, PluginExecutionError, FileBacked, SingleXMLFileBacked -from lxml.etree import XML -from xml.parsers.expat import ExpatError +from lxml.etree import XML, XMLSyntaxError from Cheetah.Template import Template class TemplateFile(FileBacked): @@ -38,7 +37,7 @@ class CheetahProperties(SingleXMLFileBacked): try: self.properties = XML(self.data) del self.data - except ExpatError: + except XMLSyntaxError: syslog(LOG_ERR, "TCheetah: Failed to parse properties") class TCheetah(Plugin): |