Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: compare-puppet-catalogs: Fix pyflakes warnings
......................................................................
compare-puppet-catalogs: Fix pyflakes warnings
Change-Id: I4a678ebeb25f985293f6c48bb54fe777904d1ff6
---
M compare-puppet-catalogs/puppet_compare/diff2html.py
M compare-puppet-catalogs/puppet_compare/generator.py
M compare-puppet-catalogs/puppet_compare/parser.py
M compare-puppet-catalogs/puppet_compare/threads.py
4 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/compare-puppet-catalogs/puppet_compare/diff2html.py
b/compare-puppet-catalogs/puppet_compare/diff2html.py
index 55fb1a0..32a815b 100755
--- a/compare-puppet-catalogs/puppet_compare/diff2html.py
+++ b/compare-puppet-catalogs/puppet_compare/diff2html.py
@@ -45,7 +45,7 @@
from functools import reduce
try:
- from simplediff import diff, string_diff
+ from simplediff import diff
except ImportError:
sys.stderr.write(
"info: simplediff module not found, only linediff is available\n")
@@ -138,12 +138,12 @@
fx, fy = father_coord
father_val = d[fx][fy][0]
- diff = (cx - fx, cy - fy)
+ reldiff = (cx - fx, cy - fy)
- if diff == (0, 1):
+ if reldiff == (0, 1):
l1.append("")
l2.append(DIFFON + t[fy] + DIFFOFF)
- elif diff == (1, 0):
+ elif reldiff == (1, 0):
l1.append(DIFFON + s[fx] + DIFFOFF)
l2.append("")
elif child_val - father_val == 1:
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py
b/compare-puppet-catalogs/puppet_compare/generator.py
index 799dd3f..c950066 100644
--- a/compare-puppet-catalogs/puppet_compare/generator.py
+++ b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -3,12 +3,10 @@
import subprocess
import shlex
from collections import defaultdict
-from subprocess import CalledProcessError
from jinja2 import Environment, PackageLoader
import requests
import logging
import json
-import sys
import socket
log = logging.getLogger('puppet_compare')
@@ -162,7 +160,6 @@
return n.match_physical_nodes(get_nodes())
def on_node_compiled(self, msg):
- node = msg['data'][0][0]
self.count += 1
if not self.count % 5:
self.update_index()
@@ -303,6 +300,3 @@
super(NodeVersionsChange, self).__init__(args)
self.compile_versions = [('2.7', self.change), ('3', self.change)]
self.mode = 'versions'
-
-if __name__ == '__main__':
- main()
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py
b/compare-puppet-catalogs/puppet_compare/parser.py
index 48b24e7..677e207 100644
--- a/compare-puppet-catalogs/puppet_compare/parser.py
+++ b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -41,7 +41,7 @@
)
log.debug(cmd)
return subprocess.check_output(cmd, shell=True)
- except subprocess.CalledProcessError as e:
+ except subprocess.CalledProcessError:
# TODO: logging!
log.error('Could not create the diffs; command was %s', cmd)
return ''
diff --git a/compare-puppet-catalogs/puppet_compare/threads.py
b/compare-puppet-catalogs/puppet_compare/threads.py
index aa01fb6..242508c 100644
--- a/compare-puppet-catalogs/puppet_compare/threads.py
+++ b/compare-puppet-catalogs/puppet_compare/threads.py
@@ -4,6 +4,9 @@
try:
# python 2.x
import Queue as queue
+ # Work around for pyflakes < 0.6.
+ # TODO: Remove when pyflakes has been updated.
+ queue
except ImportError:
# python 3.x
import queue
--
To view, visit https://gerrit.wikimedia.org/r/169260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a678ebeb25f985293f6c48bb54fe777904d1ff6
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
