From 2e4d3a900e8f448363c1d2d95aa9966bb5abe671 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 Aug 2012 15:20:11 -0400 Subject: py3k xml fixes --- src/sbin/bcfg2 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/sbin') 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: " -- cgit v1.2.3-1-g7c22