From 7fcb71a1a06b4656b75bfa653b13667506cf5ed7 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 28 Nov 2005 21:39:04 +0000 Subject: 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 --- src/lib/Server/Plugins/TCheetah.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Plugins/TCheetah.py') 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): -- cgit v1.2.3-1-g7c22