Fix lint related to operator positioning (prometheus#273)

bz2 · brian-brazil · commit ec1a9f66896d · 2018-05-19T15:31:15.000+01:00
Resolves W503.

Also drive-by move definition of gauge multiprocess modes.

Signed-off-by: Martin Packman &lt;martin@zegami.com&gt;
diff --git a/prometheus_client/core.py b/prometheus_client/core.py
@@ -175,11 +175,11 @@ def add_sample(self, name, labels, value):
         self.samples.append((name, labels, value))
 
     def __eq__(self, other):
-        return (isinstance(other, Metric)
-                and self.name == other.name
-                and self.documentation == other.documentation
-                and self.type == other.type
-                and self.samples == other.samples)
+        return (isinstance(other, Metric) and
+                self.name == other.name and
+                self.documentation == other.documentation and
+                self.type == other.type and
+                self.samples == other.samples)
 
 
 class UntypedMetricFamily(Metric):
@@ -722,10 +722,11 @@ def f():
     '''
     _type = 'gauge'
     _reserved_labelnames = []
+    _MULTIPROC_MODES = frozenset(('min', 'max', 'livesum', 'liveall', 'all'))
 
     def __init__(self, name, labelnames, labelvalues, multiprocess_mode='all'):
-        if (_ValueClass._multiprocess
-                and multiprocess_mode not in ['min', 'max', 'livesum', 'liveall', 'all']):
+        if (_ValueClass._multiprocess and
+                multiprocess_mode not in self._MULTIPROC_MODES):
             raise ValueError('Invalid multiprocess mode: ' + multiprocess_mode)
         self._value = _ValueClass(
             self._type, name, name, labelnames, labelvalues,
diff --git a/tox.ini b/tox.ini
@@ -66,6 +66,5 @@ ignore =
     E741,
     F841,
     W293,
-    W503
 import-order-style = google
 application-import-names = prometheus_client
