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 --- src/sbin/Bcfg2Server | 2 +- src/sbin/Bcfg2ServerX | 2 +- src/sbin/StatReports | 2 +- src/sbin/bcfg2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sbin') 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