diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-29 12:49:08 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-29 12:49:08 -0400 |
| commit | fa402689293283222915f372fa37f233c97f4ed6 (patch) | |
| tree | 3a1faec1c5890d133cf61dbb7a44dbf8c0c11f69 | |
| parent | a619bf537ceb33848012f334200a7e552d7b4bdd (diff) | |
| download | bcfg2-fa402689293283222915f372fa37f233c97f4ed6.tar.gz bcfg2-fa402689293283222915f372fa37f233c97f4ed6.tar.bz2 bcfg2-fa402689293283222915f372fa37f233c97f4ed6.zip | |
Probes: fixed long lines
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 09e648750..55e5ddc47 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -153,16 +153,16 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet): probe = lxml.etree.Element('probe') probe.set('name', os.path.basename(name)) probe.set('source', self.plugin_name) - if metadata.version_info and metadata.version_info > (1, 3, 1, '', 0): + if (metadata.version_info and + metadata.version_info > (1, 3, 1, '', 0)): probe.text = entry.data.decode('utf-8') else: - # msg = "Client unable to handle unicode probes." - # raise Bcfg2.Server.Plugin.PluginExecutionError(msg) try: probe.text = entry.data - except: - self.logger.error("Client unable to handle unicode probes. " - "Skipping %s" % probe.get('name')) + except: # pylint: disable=W0702 + self.logger.error("Client unable to handle unicode " + "probes. Skipping %s" % + probe.get('name')) continue match = self.bangline.match(entry.data.split('\n')[0]) if match: @@ -219,8 +219,9 @@ class Probes(Bcfg2.Server.Plugin.Probing, lxml.etree.SubElement(top, 'Client', name=client, timestamp=str(int(probedata.timestamp))) for probe in sorted(probedata): - lxml.etree.SubElement(ctag, 'Probe', name=probe, - value=str(self.probedata[client][probe]).decode('utf-8')) + lxml.etree.SubElement( + ctag, 'Probe', name=probe, + value=str(self.probedata[client][probe]).decode('utf-8')) for group in sorted(self.cgroups[client]): lxml.etree.SubElement(ctag, "Group", name=group) try: |