summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-07-29 15:10:43 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-07-29 15:10:43 +0000
commit71668ac5fd26304a4aa124f182e03187303a0e46 (patch)
tree84116317afe6cde3aaf2a584de2b6a893696773c /src
parentf65abe0247b7c23dee8bb0b0b317b55feb8123be (diff)
downloadbcfg2-71668ac5fd26304a4aa124f182e03187303a0e46.tar.gz
bcfg2-71668ac5fd26304a4aa124f182e03187303a0e46.tar.bz2
bcfg2-71668ac5fd26304a4aa124f182e03187303a0e46.zip
Pass through encoding when using the python2.5 version of elementtree
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4835 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/XML.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Client/XML.py b/src/lib/Client/XML.py
index baf533a02..8de3b3a7e 100644
--- a/src/lib/Client/XML.py
+++ b/src/lib/Client/XML.py
@@ -16,7 +16,7 @@ except ImportError:
SubElement = xml.etree.ElementTree.SubElement
XML = xml.etree.ElementTree.XML
def tostring(e, encoding=None, xml_declaration=None):
- return xml.etree.ElementTree.tostring(e)
+ return xml.etree.ElementTree.tostring(e, encoding=encoding)
driver = 'etree-py'
except ImportError:
try: