diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-08-14 15:20:23 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-08-14 15:20:23 +0000 |
| commit | 6f83d1d62ce9a8fa56db8f7966eae216d538adf4 (patch) | |
| tree | a4df4ea458bc3b40021dc9812a3d24ce420c8b21 /src/lib/Client/XML.py | |
| parent | aed32c5e04799925c309a802f8c802e238ccdb4d (diff) | |
| download | bcfg2-6f83d1d62ce9a8fa56db8f7966eae216d538adf4.tar.gz bcfg2-6f83d1d62ce9a8fa56db8f7966eae216d538adf4.tar.bz2 bcfg2-6f83d1d62ce9a8fa56db8f7966eae216d538adf4.zip | |
* Make all XML methods uniform across drivers
* Switch bcfg2 to using the XML abstraction layer
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2064 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/XML.py')
| -rw-r--r-- | src/lib/Client/XML.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Client/XML.py b/src/lib/Client/XML.py index b0ae0f771..ec668711a 100644 --- a/src/lib/Client/XML.py +++ b/src/lib/Client/XML.py @@ -4,18 +4,18 @@ __revision__ = '$Revision$' # library will use lxml, then builtin xml.etree, then ElementTree try: - from lxml.etree import Element, SubElement, tostring + from lxml.etree import Element, SubElement, XML, tostring from lxml.etree import XMLSyntaxError as ParseError driver = 'lxml' except ImportError: # lxml not available try: - from xml.etree.ElementTree import Element, XML, tostring + from xml.etree.ElementTree import Element, SubElement, XML, tostring from xml.parsers.expat import ExpatError as ParseError driver = 'etree-py' except ImportError: try: - from elementtree.ElementTree import Element, XML, tostring + from elementtree.ElementTree import Element, SubElement, XML, tostring from xml.parsers.expat import ExpatError as ParseError driver = 'etree' except ImportError: |