From 7fcb71a1a06b4656b75bfa653b13667506cf5ed7 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
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/Base.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/Server/Plugins/Base.py')

diff --git a/src/lib/Server/Plugins/Base.py b/src/lib/Server/Plugins/Base.py
index 0b912cb01..71719263f 100644
--- a/src/lib/Server/Plugins/Base.py
+++ b/src/lib/Server/Plugins/Base.py
@@ -2,8 +2,7 @@
 __revision__ = '$Revision$'
 
 from copy import deepcopy
-from lxml.etree import Element, XML
-from xml.parsers.expat import ExpatError
+from lxml.etree import Element, XML, XMLSyntaxError
 
 from Bcfg2.Server.Plugin import Plugin, PluginInitError, SingleXMLFileBacked
 
@@ -27,7 +26,7 @@ class Base(Plugin, SingleXMLFileBacked):
         '''Store XML data in reasonable structures'''
         try:
             xdata = XML(self.data)
-        except ExpatError:
+        except XMLSyntaxError:
             self.LogError("Failed to parse base.xml")
             return
         self.store = {'all':[], 'Class':{'all':[]}, 'Image':{'all':[]}, 'all':[]}
-- 
cgit v1.2.3-1-g7c22