[MediaWiki-commits] [Gerrit] operations...pybal[2.0-dev]: Enable flake8 on pybal/monitors
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355878 )
Change subject: Enable flake8 on pybal/monitors
..
Enable flake8 on pybal/monitors
The only section that is left out is pybal/bgp, which might change
further before it's stable enough in master
Change-Id: I7611c9fe4def08567fb6bd513e2196321b544d22
---
M pybal/monitors/__skeleton__.py
M pybal/monitors/dnsquery.py
M pybal/monitors/idleconnection.py
M pybal/monitors/proxyfetch.py
M pybal/monitors/runcommand.py
M tox.ini
6 files changed, 45 insertions(+), 36 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Ema: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pybal/monitors/__skeleton__.py b/pybal/monitors/__skeleton__.py
index 5592b4b..a2e8a77 100644
--- a/pybal/monitors/__skeleton__.py
+++ b/pybal/monitors/__skeleton__.py
@@ -9,23 +9,24 @@
from pybal import monitor
+
class SkeletonMonitoringProtocol(monitor.MonitoringProtocol):
"""
Description.
"""
-
+
__name__ = 'Skeleton'
-
+
def __init__(self, coordinator, server, configuration):
"""Constructor"""
-# Call ancestor constructor
+# Call ancestor constructor
super(SkeletonMonitoringProtocol, self).__init__(coordinator, server,
configuration)
-
+
def run(self):
-"""Start the monitoring"""
+"""Start the monitoring"""
pass
-
+
def stop(self):
"""Stop the monitoring"""
pass
diff --git a/pybal/monitors/dnsquery.py b/pybal/monitors/dnsquery.py
index b374791..3c447c5 100644
--- a/pybal/monitors/dnsquery.py
+++ b/pybal/monitors/dnsquery.py
@@ -4,15 +4,16 @@
DNS Monitor class implementation for PyBal
"""
-
-from pybal import monitor
+import logging
+import random
+import socket
from twisted.internet import reactor, defer
from twisted.names import client, dns, error
from twisted.python import runtime
-import logging
-import random, socket
+from pybal import monitor
+
class DNSQueryMonitoringProtocol(monitor.MonitoringProtocol):
"""
@@ -28,7 +29,6 @@
error.AuthoritativeDomainError, error.DNSFormatError,
error.DNSNameError,
error.DNSQueryRefusedError, error.DNSQueryTimeoutError,
error.DNSServerError, error.DNSUnknownError)
-
def __init__(self, coordinator, server, configuration):
"""Constructor"""
@@ -79,9 +79,8 @@
elif query.type == dns.:
self.DNSQueryDeferred = self.resolver.lookupIPV6Address(hostname,
timeout=[self.toQuery])
-self.DNSQueryDeferred.addCallback(self._querySuccessful, query
-).addErrback(self._queryFailed, query
-).addBoth(self._checkFinished)
+self.DNSQueryDeferred.addCallback(self._querySuccessful, query) \
+.addErrback(self._queryFailed, query).addBoth(self._checkFinished)
return self.DNSQueryDeferred
def _querySuccessful(self, (answers, authority, additional), query):
@@ -96,8 +95,8 @@
else:
resultStr = None
-self.report('DNS query successful, %.3f s' % (runtime.seconds() -
self.checkStartTime)
-+ (resultStr and (': ' + resultStr) or ""))
+self.report('DNS query successful, %.3f s' % (runtime.seconds() -
self.checkStartTime) +
+(resultStr and (': ' + resultStr) or ""))
self._resultUp()
return answers, authority, additional
diff --git a/pybal/monitors/idleconnection.py b/pybal/monitors/idleconnection.py
index 42c556d..f1cadec 100644
--- a/pybal/monitors/idleconnection.py
+++ b/pybal/monitors/idleconnection.py
@@ -7,7 +7,7 @@
from pybal import monitor
-from twisted.internet import reactor, protocol
+from twisted.internet import protocol
import logging
import socket
diff --git a/pybal/monitors/proxyfetch.py b/pybal/monitors/proxyfetch.py
index 3468e73..c6da271 100644
--- a/pybal/monitors/proxyfetch.py
+++ b/pybal/monitors/proxyfetch.py
@@ -5,12 +5,14 @@
Monitor class implementations for PyBal
"""
-from pybal import monitor, util
+import logging
+import random
from twisted.internet import reactor, defer
from twisted.web import client
from twisted.python.runtime import seconds
-import logging, random
+
+from pybal import monitor, util
log = util.log
diff --git a/pybal/monitors/runcommand.py b/pybal/monitors/runcommand.py
index a0ca0ec..c7f498c 100644
--- a/pybal/monitors/runcommand.py
+++ b/pybal/monitors/runcommand.py
@@ -4,14 +4,16 @@
Monitor class implementations for PyBal
"""
+import errno
+import logging
+import os
+import signal
+
+from twisted.internet import reactor, process, error
from pybal import monitor
from pybal.util import log
-import os, sys, signal, errno
-import logging
-
-from twisted.internet import reactor, process, error
[MediaWiki-commits] [Gerrit] operations...pybal[2.0-dev]: Enable flake8 on pybal/monitors
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355878 )
Change subject: Enable flake8 on pybal/monitors
..
Enable flake8 on pybal/monitors
The only section that is left out is pybal/bgp, which might change
further before it's stable enough in master
Change-Id: I7611c9fe4def08567fb6bd513e2196321b544d22
---
M pybal/monitors/__skeleton__.py
M pybal/monitors/dnsquery.py
M pybal/monitors/idleconnection.py
M pybal/monitors/proxyfetch.py
M pybal/monitors/runcommand.py
M tox.ini
6 files changed, 45 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal
refs/changes/78/355878/1
diff --git a/pybal/monitors/__skeleton__.py b/pybal/monitors/__skeleton__.py
index 5592b4b..a2e8a77 100644
--- a/pybal/monitors/__skeleton__.py
+++ b/pybal/monitors/__skeleton__.py
@@ -9,23 +9,24 @@
from pybal import monitor
+
class SkeletonMonitoringProtocol(monitor.MonitoringProtocol):
"""
Description.
"""
-
+
__name__ = 'Skeleton'
-
+
def __init__(self, coordinator, server, configuration):
"""Constructor"""
-# Call ancestor constructor
+# Call ancestor constructor
super(SkeletonMonitoringProtocol, self).__init__(coordinator, server,
configuration)
-
+
def run(self):
-"""Start the monitoring"""
+"""Start the monitoring"""
pass
-
+
def stop(self):
"""Stop the monitoring"""
pass
diff --git a/pybal/monitors/dnsquery.py b/pybal/monitors/dnsquery.py
index b374791..3c447c5 100644
--- a/pybal/monitors/dnsquery.py
+++ b/pybal/monitors/dnsquery.py
@@ -4,15 +4,16 @@
DNS Monitor class implementation for PyBal
"""
-
-from pybal import monitor
+import logging
+import random
+import socket
from twisted.internet import reactor, defer
from twisted.names import client, dns, error
from twisted.python import runtime
-import logging
-import random, socket
+from pybal import monitor
+
class DNSQueryMonitoringProtocol(monitor.MonitoringProtocol):
"""
@@ -28,7 +29,6 @@
error.AuthoritativeDomainError, error.DNSFormatError,
error.DNSNameError,
error.DNSQueryRefusedError, error.DNSQueryTimeoutError,
error.DNSServerError, error.DNSUnknownError)
-
def __init__(self, coordinator, server, configuration):
"""Constructor"""
@@ -79,9 +79,8 @@
elif query.type == dns.:
self.DNSQueryDeferred = self.resolver.lookupIPV6Address(hostname,
timeout=[self.toQuery])
-self.DNSQueryDeferred.addCallback(self._querySuccessful, query
-).addErrback(self._queryFailed, query
-).addBoth(self._checkFinished)
+self.DNSQueryDeferred.addCallback(self._querySuccessful, query) \
+.addErrback(self._queryFailed, query).addBoth(self._checkFinished)
return self.DNSQueryDeferred
def _querySuccessful(self, (answers, authority, additional), query):
@@ -96,8 +95,8 @@
else:
resultStr = None
-self.report('DNS query successful, %.3f s' % (runtime.seconds() -
self.checkStartTime)
-+ (resultStr and (': ' + resultStr) or ""))
+self.report('DNS query successful, %.3f s' % (runtime.seconds() -
self.checkStartTime) +
+(resultStr and (': ' + resultStr) or ""))
self._resultUp()
return answers, authority, additional
diff --git a/pybal/monitors/idleconnection.py b/pybal/monitors/idleconnection.py
index 42c556d..f1cadec 100644
--- a/pybal/monitors/idleconnection.py
+++ b/pybal/monitors/idleconnection.py
@@ -7,7 +7,7 @@
from pybal import monitor
-from twisted.internet import reactor, protocol
+from twisted.internet import protocol
import logging
import socket
diff --git a/pybal/monitors/proxyfetch.py b/pybal/monitors/proxyfetch.py
index 3468e73..c6da271 100644
--- a/pybal/monitors/proxyfetch.py
+++ b/pybal/monitors/proxyfetch.py
@@ -5,12 +5,14 @@
Monitor class implementations for PyBal
"""
-from pybal import monitor, util
+import logging
+import random
from twisted.internet import reactor, defer
from twisted.web import client
from twisted.python.runtime import seconds
-import logging, random
+
+from pybal import monitor, util
log = util.log
diff --git a/pybal/monitors/runcommand.py b/pybal/monitors/runcommand.py
index a0ca0ec..c7f498c 100644
--- a/pybal/monitors/runcommand.py
+++ b/pybal/monitors/runcommand.py
@@ -4,14 +4,16 @@
Monitor class implementations for PyBal
"""
+import errno
+import logging
+import os
+import signal
+
+from twisted.internet import reactor, process, error
from pybal import monitor
from pybal.util import log
-import os, sys, signal, errno
-import logging
-
-from twisted.internet import reactor, process, error
class ProcessGroupProcess(process.Process, object):
