diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 15:29:48 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 15:29:48 -0500 |
| commit | 5b5427a214f7e4c11a22ea6a0d319c40b06662c1 (patch) | |
| tree | ea17ecbdf858a28520e9e86ece2ef68483be64ab /src/lib/Server/Core.py | |
| parent | dd6fba39f81648936b987da73599de8b6c2c241c (diff) | |
| parent | b1ab3e2bab9f07c13daf5dcfd4a9502eb84dcf0d (diff) | |
| download | bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.tar.gz bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.tar.bz2 bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.zip | |
Merge branch 'py3k'
Conflicts:
src/lib/Server/Plugins/SSHbase.py
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Core.py')
| -rw-r--r-- | src/lib/Server/Core.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 8f9d3e746..5adfa5381 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -384,7 +384,7 @@ class Core(Component): # clear dynamic groups self.metadata.cgroups[meta.hostname] = [] try: - xpdata = lxml.etree.XML(probedata) + xpdata = lxml.etree.XML(probedata.encode('utf-8')) except: self.logger.error("Failed to parse probe data from client %s" % \ (address[0])) @@ -433,7 +433,7 @@ class Core(Component): @exposed def RecvStats(self, address, stats): """Act on statistics upload.""" - sdata = lxml.etree.XML(stats) + sdata = lxml.etree.XML(stats.encode('utf-8')) client = self.metadata.resolve_client(address) self.process_statistics(client, sdata) return "<ok/>" |