diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2005-11-12 18:45:16 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2005-11-12 18:45:16 +0000 |
| commit | fc81e5994c0bdadc597502951798dc97d4db7793 (patch) | |
| tree | 3b63a938fa118854bec9031560867be1f6c0daf8 /src/lib/Server/Plugins | |
| parent | cd49b015166431d36cbe821ec19a5c3e1fad6763 (diff) | |
| download | bcfg2-fc81e5994c0bdadc597502951798dc97d4db7793.tar.gz bcfg2-fc81e5994c0bdadc597502951798dc97d4db7793.tar.bz2 bcfg2-fc81e5994c0bdadc597502951798dc97d4db7793.zip | |
switch to lxml
(Logical change 1.357)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1488 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins')
| -rw-r--r-- | src/lib/Server/Plugins/Base.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Bundler.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Hostbase.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/TCheetah.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Vhost.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/Server/Plugins/Base.py b/src/lib/Server/Plugins/Base.py index 905287144..0b912cb01 100644 --- a/src/lib/Server/Plugins/Base.py +++ b/src/lib/Server/Plugins/Base.py @@ -2,7 +2,7 @@ __revision__ = '$Revision$' from copy import deepcopy -from elementtree.ElementTree import Element, XML +from lxml.etree import Element, XML from xml.parsers.expat import ExpatError from Bcfg2.Server.Plugin import Plugin, PluginInitError, SingleXMLFileBacked diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py index b2ea2d9e5..c602dceb7 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Server/Plugins/Bundler.py @@ -3,11 +3,11 @@ __revision__ = '$Revision$' from copy import deepcopy from syslog import LOG_ERR, syslog +from lxml.etree import Element, XML +from xml.parsers.expat import ExpatError from Bcfg2.Server.Plugin import Plugin, SingleXMLFileBacked, XMLFileBacked, DirectoryBacked -from elementtree.ElementTree import Element, XML -from xml.parsers.expat import ExpatError class ImageFile(SingleXMLFileBacked): '''This file contains image -> system mappings''' diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Server/Plugins/Hostbase.py index 59518b542..3612486ea 100644 --- a/src/lib/Server/Plugins/Hostbase.py +++ b/src/lib/Server/Plugins/Hostbase.py @@ -2,7 +2,7 @@ __revision__ = '$Revision$' from syslog import syslog, LOG_INFO -from cElementTree import XML +from lxml.etree import XML from Cheetah.Template import Template from Bcfg2.Server.Plugin import Plugin, PluginExecutionError, PluginInitError, DirectoryBacked diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index 528af2019..9b58737c1 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -4,7 +4,7 @@ __revision__ = '$Revision$' from posixpath import isdir from syslog import syslog, LOG_ERR from Bcfg2.Server.Plugin import Plugin, PluginExecutionError, FileBacked, SingleXMLFileBacked -from elementtree.ElementTree import XML +from lxml.etree import XML from xml.parsers.expat import ExpatError from Cheetah.Template import Template diff --git a/src/lib/Server/Plugins/Vhost.py b/src/lib/Server/Plugins/Vhost.py index b7a0c6a66..56d4e68f8 100644 --- a/src/lib/Server/Plugins/Vhost.py +++ b/src/lib/Server/Plugins/Vhost.py @@ -16,7 +16,7 @@ __revision__ = '$Revision$' import base64 from copy import deepcopy -from elementtree.ElementTree import XML, Element, SubElement +from lxml.etree import XML, Element, SubElement from socket import gethostbyname from Bcfg2.Server.Plugin import Plugin, PluginExecutionError, SingleXMLFileBacked |