diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 15:20:11 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 15:20:11 -0400 |
commit | 2e4d3a900e8f448363c1d2d95aa9966bb5abe671 (patch) | |
tree | 8fe32ba3e65a010bc047a626c080b616256948c1 /src/lib/Bcfg2/Server | |
parent | 854aaf4986cd79b659fe4de0b1d319dbd5f9ac92 (diff) | |
download | bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.tar.gz bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.tar.bz2 bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.zip |
py3k xml fixes
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 377932614..43f2ce68c 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -554,7 +554,7 @@ class BaseCore(object): for probe in plugin.GetProbes(metadata): resp.append(probe) return lxml.etree.tostring(resp, encoding='UTF-8', - xml_declaration=True) + xml_declaration=False) except: err = sys.exc_info()[1] self.critical_error("Error determining probes for %s: %s" % @@ -609,7 +609,7 @@ class BaseCore(object): try: config = self.BuildConfiguration(client) return lxml.etree.tostring(config, encoding='UTF-8', - xml_declaration=True) + xml_declaration=False) except Bcfg2.Server.Plugin.MetadataConsistencyError: self.critical_error("Metadata consistency failure for %s" % client) diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 6be189cfd..3aee43543 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -151,7 +151,8 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): raise Bcfg2.Server.Plugin.MetadataRuntimeError(msg) # prep data dataroot = xmltree.getroot() - newcontents = lxml.etree.tostring(dataroot, pretty_print=True) + newcontents = str(lxml.etree.tostring(dataroot, pretty_print=True, + encoding='unicode')) fd = datafile.fileno() while locked(fd) == True: |