From fc81e5994c0bdadc597502951798dc97d4db7793 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sat, 12 Nov 2005 18:45:16 +0000 Subject: 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 --- debian/control | 4 ++-- src/lib/Client/Toolset.py | 2 +- src/lib/Client/XMLRPCComm.py | 2 +- src/lib/Server/Core.py | 2 +- src/lib/Server/Metadata.py | 2 +- src/lib/Server/Plugin.py | 2 +- src/lib/Server/Plugins/Base.py | 2 +- src/lib/Server/Plugins/Bundler.py | 4 ++-- src/lib/Server/Plugins/Hostbase.py | 2 +- src/lib/Server/Plugins/TCheetah.py | 2 +- src/lib/Server/Plugins/Vhost.py | 2 +- src/sbin/Bcfg2Server | 2 +- src/sbin/Bcfg2ServerX | 2 +- src/sbin/StatReports | 2 +- src/sbin/bcfg2 | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/debian/control b/debian/control index 8104cfd63..37fead0ed 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1.1 Package: bcfg2 Architecture: all -Depends: ${python:Depends}, debsums, python-apt, python-elementtree +Depends: ${python:Depends}, debsums, python-apt, python-lxml Description: build configuration system Bcfg2 is a symbolic configuration management system, produced at Argonne National Lab. @@ -15,7 +15,7 @@ Description: build configuration system Package: bcfg2-server Architecture: all -Depends: ${python:Depends}, bcfg2, python-elementtree, python2.3-fam | python2.3-gamin, m2crypto +Depends: ${python:Depends}, bcfg2, python-lxml, python2.3-fam | python2.3-gamin, m2crypto Description: build configuration system, version two Bcfg2 is a symbolic configuration management system, produced at Argonne National Lab. diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py index 60c062a45..b5bbc582d 100644 --- a/src/lib/Client/Toolset.py +++ b/src/lib/Client/Toolset.py @@ -15,7 +15,7 @@ import stat as statmod from traceback import extract_tb from popen2 import Popen4 -from elementtree.ElementTree import Element, SubElement, tostring +from lxml.etree import Element, SubElement, tostring def calc_perms(initial, perms): '''This compares ondisk permissions with specified ones''' diff --git a/src/lib/Client/XMLRPCComm.py b/src/lib/Client/XMLRPCComm.py index 72e494396..85af535da 100644 --- a/src/lib/Client/XMLRPCComm.py +++ b/src/lib/Client/XMLRPCComm.py @@ -1,7 +1,7 @@ '''XMLRPC/SSL Communication Library (following the ssslib API)''' __revision__ = '$Revision:$' -from elementtree.ElementTree import XML +from lxml.etree import XML from ConfigParser import ConfigParser from xmlrpclib import Fault, ServerProxy from sys import exc_info diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 1b1504dc1..588ae7670 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -8,7 +8,7 @@ from syslog import syslog, LOG_ERR, LOG_INFO from traceback import extract_tb from time import time from ConfigParser import ConfigParser -from elementtree.ElementTree import Element +from lxml.etree import Element from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError from Bcfg2.Server.Metadata import MetadataStore, MetadataConsistencyError diff --git a/src/lib/Server/Metadata.py b/src/lib/Server/Metadata.py index 272be74b9..a4f3779d4 100644 --- a/src/lib/Server/Metadata.py +++ b/src/lib/Server/Metadata.py @@ -1,7 +1,7 @@ '''This file stores persistent metadata for the BCFG Configuration Repository''' __revision__ = '$Revision$' -from elementtree.ElementTree import XML, SubElement, Element +from lxml.etree import XML, SubElement, Element from syslog import syslog, LOG_ERR, LOG_INFO from Bcfg2.Server.Plugin import SingleXMLFileBacked diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 192252d9e..0e174375a 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -1,7 +1,7 @@ '''This module provides the baseclass for Bcfg2 Server Plugins''' __revision__ = '$Revision:$' -from elementtree.ElementTree import XML +from lxml.etree import XML from os import stat from stat import ST_MTIME from syslog import syslog, LOG_ERR, LOG_INFO 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 diff --git a/src/sbin/Bcfg2Server b/src/sbin/Bcfg2Server index 18f2bcd77..72fd53115 100644 --- a/src/sbin/Bcfg2Server +++ b/src/sbin/Bcfg2Server @@ -10,7 +10,7 @@ from syslog import openlog, syslog, LOG_INFO, LOG_ERR, LOG_LOCAL0 from sys import argv, exit as sysexit, exc_info from traceback import extract_tb -from elementtree.ElementTree import Element +from lxml.etree import Element from Bcfg2.Server.Core import Core, CoreInitError from Bcfg2.Server.Metadata import MetadataConsistencyError diff --git a/src/sbin/Bcfg2ServerX b/src/sbin/Bcfg2ServerX index 261efaacd..c43ba26dd 100644 --- a/src/sbin/Bcfg2ServerX +++ b/src/sbin/Bcfg2ServerX @@ -13,7 +13,7 @@ from threading import Lock from select import select, error as selecterror from xmlrpclib import Fault from socket import gethostbyaddr, herror -from elementtree.ElementTree import XML, Element, tostring +from lxml.etree import XML, Element, tostring def dgetopt(arglist, opt, vopt): '''parse options into a dictionary''' diff --git a/src/sbin/StatReports b/src/sbin/StatReports index f82f69a32..8539eb4de 100644 --- a/src/sbin/StatReports +++ b/src/sbin/StatReports @@ -8,7 +8,7 @@ for bcfg2''' __revision__ = '$Revision$' from ConfigParser import ConfigParser, NoSectionError, NoOptionError -from elementtree.ElementTree import XML, Element, SubElement, tostring +from lxml.etree import XML, Element, SubElement, tostring from xml.parsers.expat import ExpatError from time import asctime, strptime, time from socket import getfqdn diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index bfb41738c..a7779e6ee 100644 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -11,7 +11,7 @@ from tempfile import mktemp from ConfigParser import ConfigParser, NoSectionError, NoOptionError from time import time -from elementtree.ElementTree import Element, XML, tostring +from lxml.etree import Element, XML, tostring def cb_sigint_handler(signum, frame): '''Exit upon CTRL-C''' -- cgit v1.2.3-1-g7c22