diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-05-10 11:03:35 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-05-10 11:03:57 -0500 |
| commit | 4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71 (patch) | |
| tree | f220806603bd9c79d7c4fa738f355a192870f289 /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | af45a5b9fd50ca233757fc0203325b257254cd87 (diff) | |
| download | bcfg2-4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71.tar.gz bcfg2-4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71.tar.bz2 bcfg2-4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71.zip | |
Probes: Fix failing nosetests
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 309b96475..f8baddb4b 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -63,7 +63,7 @@ class ProbeData(str): # pylint: disable=E0012,R0924 .json, and .yaml properties to provide convenient ways to use ProbeData objects as XML, JSON, or YAML data """ def __new__(cls, data): - return str.__new__(cls, data.encode('utf-8')) + return str.__new__(cls, data) def __init__(self, data): # pylint: disable=W0613 str.__init__(self) @@ -222,15 +222,9 @@ class Probes(Bcfg2.Server.Plugin.Probing, lxml.etree.SubElement(top, 'Client', name=client, timestamp=str(int(probedata.timestamp))) for probe in sorted(probedata): - try: - lxml.etree.SubElement( - ctag, 'Probe', name=probe, - value=str( - self.probedata[client][probe]).decode('utf-8')) - except AttributeError: - lxml.etree.SubElement( - ctag, 'Probe', name=probe, - value=str(self.probedata[client][probe])) + lxml.etree.SubElement( + ctag, 'Probe', name=probe, + value=self.probedata[client][probe]) for group in sorted(self.cgroups[client]): lxml.etree.SubElement(ctag, "Group", name=group) try: |