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/sbin | |
| parent | 854aaf4986cd79b659fe4de0b1d319dbd5f9ac92 (diff) | |
| download | bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.tar.gz bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.tar.bz2 bcfg2-2e4d3a900e8f448363c1d2d95aa9966bb5abe671.zip | |
py3k xml fixes
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index ff5644cc1..d757ca08a 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -190,7 +190,7 @@ class Client: times['probe_download'] = time.time() try: - probes = Bcfg2.Client.XML.XML(probe_data) + probes = Bcfg2.Client.XML.XML(str(probe_data)) except Bcfg2.Client.XML.ParseError: syntax_error = sys.exc_info()[1] self.fatal_error( @@ -211,8 +211,7 @@ class Client: try: # upload probe responses proxy.RecvProbeData(Bcfg2.Client.XML.tostring(probedata, - encoding='UTF-8', - xml_declaration=True)) + encoding='unicode')) except Bcfg2.Proxy.ProxyError: err = sys.exc_info()[1] self.logger.error("Failed to upload probe data: %s" % err) @@ -311,8 +310,7 @@ class Client: try: proxy.RecvStats(Bcfg2.Client.XML.tostring(feedback, - encoding='UTF-8', - xml_declaration=True)) + encoding='unicode')) except Bcfg2.Proxy.ProxyError: err = sys.exc_info()[1] self.logger.error("Failed to upload configuration statistics: " |