Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Perf.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Fam.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Base.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Cvs.py
	src/lib/Bcfg2/Server/Plugins/Darcs.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Fossil.py
	src/lib/Bcfg2/Server/Plugins/Git.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/__init__.py
	src/lib/Bcfg2/Server/__init__.py
	src/sbin/bcfg2-build-reports
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

1 files changed, 17 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py
index 66c1ce430..10a15f160 100644
--- a/src/lib/Bcfg2/Client/Client.py
+++ b/src/lib/Bcfg2/Client/Client.py
@@ -91,7 +91,10 @@ class Client(object):
             try:
                 script.write("#!%s\n" %
                              (probe.attrib.get('interpreter', '/bin/sh')))
-                script.write(probe.text)
+                if sys.hexversion >= 0x03000000:
+                    script.write(probe.text)
+                else:
+                    script.write(probe.text.encode('utf-8'))
                 script.close()
                 os.chmod(scriptname,
                          stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH |
@@ -105,7 +108,10 @@ class Client(object):
                     self._probe_failure(name, "Return value %s" % rv)
                 self.logger.info("Probe %s has result:" % name)
                 self.logger.info(rv.stdout)
-                ret.text = rv.stdout
+                if sys.hexversion >= 0x03000000:
+                    ret.text = rv.stdout
+                else:
+                    ret.text = rv.stdout.decode('utf-8')
             finally:
                 os.unlink(scriptname)
         except SystemExit:
@@ -164,10 +170,11 @@ class Client(object):
         if len(probes.findall(".//probe")) > 0:
             try:
                 # upload probe responses
-                self.proxy.RecvProbeData(Bcfg2.Client.XML.tostring(
+                self.proxy.RecvProbeData(
+                    Bcfg2.Client.XML.tostring(
                         probedata,
-                        xml_declaration=False).decode('UTF-8'))
-            except Bcfg2.Client.Proxy.ProxyError:
+                        xml_declaration=False).decode('utf-8'))
+            except Bcfg2.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.fatal_error("Failed to upload probe data: %s" % err)
 
@@ -228,7 +235,7 @@ class Client(object):
                     self.fatal_error("Failed to get decision list: %s" % err)
 
             try:
-                rawconfig = self.proxy.GetConfig().encode('UTF-8')
+                rawconfig = self.proxy.GetConfig().encode('utf-8')
             except Bcfg2.Client.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.fatal_error("Failed to download configuration from "
@@ -246,7 +253,7 @@ class Client(object):
 
         self.logger.info("Starting Bcfg2 client run at %s" % times['start'])
 
-        rawconfig = self.get_config(times=times)
+        rawconfig = self.get_config(times=times).decode('utf-8')
 
         if self.setup['cache']:
             try:
@@ -317,9 +324,10 @@ class Client(object):
             feedback = self.tools.GenerateStats()
 
             try:
-                self.proxy.RecvStats(Bcfg2.Client.XML.tostring(
+                self.proxy.RecvStats(
+                    Bcfg2.Client.XML.tostring(
                         feedback,
-                        xml_declaration=False).decode('UTF-8'))
+                        xml_declaration=False).decode('utf-8'))
             except Bcfg2.Client.Proxy.ProxyError:
                 err = sys.exc_info()[1]
                 self.logger.error("Failed to upload configuration statistics: "