Fix lint related to vertical whitespace (#246)

* Fix lint related to vertical whitespace

Resolves E123, E302, E303, E305, and E306.

Author: bz2

prometheus_client/core.py

@@ -121,6 +121,7 @@ def restricted_registry(self, names):
                     m = Metric(metric.name, metric.documentation, metric.type)
                     m.samples = samples
                     metrics.append(m)
+
         class RestrictedRegistry(object):
             def collect(self):
                 return metrics
@@ -435,7 +436,6 @@ def __init__(self, typ, metric_name, name, labelnames, labelvalues, multiprocess
                 self.__reset()
                 values.append(self)
 
-
         def __reset(self):
             typ, metric_name, name, labelnames, labelvalues, multiprocess_mode = self._params
             if typ == 'gauge':

prometheus_client/decorator.py

@@ -77,6 +77,7 @@ def getargspec(f):
     spec = getfullargspec(f)
     return ArgSpec(spec.args, spec.varargs, spec.varkw, spec.defaults)
 
+
 DEF = re.compile('\s*def\s*([_\w][_\w\d]*)\s*\(')
 
 
@@ -276,6 +277,7 @@ def __call__(self, func):
             func, "with _self_: return _func_(%(shortsignature)s)",
             dict(_self_=self, _func_=func), __wrapped__=func)
 
+
 init = getfullargspec(_GeneratorContextManager.__init__)
 n_args = len(init.args)
 if n_args == 2 and not init.varargs:  # (self, genobj) Python 2.7

prometheus_client/multiprocess.py

@@ -75,7 +75,6 @@ def collect(self):
                     samples.setdefault((name, labels), 0.0)
                     samples[(name, labels)] += value
 
-
             # Accumulate bucket values.
             if metric.type == 'histogram':
                 for labels, values in buckets.items():

prometheus_client/parser.py

@@ -197,7 +197,7 @@ def build_metric(name, documentation, typ, samples):
                     'gauge': [''],
                     'summary': ['_count', '_sum', ''],
                     'histogram': ['_count', '_sum', '_bucket'],
-                    }.get(typ, [''])
+                }.get(typ, [''])
                 allowed_names = [name + n for n in allowed_names]
             else:
                 # Ignore other comment tokens

tests/test_exposition.py

@@ -24,6 +24,7 @@
     from http.server import BaseHTTPRequestHandler
     from http.server import HTTPServer
 
+
 class TestGenerateText(unittest.TestCase):
     def setUp(self):
         self.registry = CollectorRegistry()
@@ -79,16 +80,20 @@ def test_escaping(self):
         self.assertEqual(b'# HELP cc A\\ncount\\\\er\n# TYPE cc counter\ncc{a="\\\\x\\n\\""} 1.0\n', generate_latest(self.registry))
 
     def test_nonnumber(self):
-        class MyNumber():
+
+        class MyNumber(object):
             def __repr__(self):
                 return "MyNumber(123)"
+
             def __float__(self):
                 return 123.0
-        class MyCollector():
+
+        class MyCollector(object):
             def collect(self):
                 metric = Metric("nonnumber", "Non number", 'untyped')
                 metric.add_sample("nonnumber", {}, MyNumber())
                 yield metric
+
         self.registry.register(MyCollector())
         self.assertEqual(b'# HELP nonnumber Non number\n# TYPE nonnumber untyped\nnonnumber 123.0\n', generate_latest(self.registry))
 
@@ -98,6 +103,7 @@ def setUp(self):
         self.registry = CollectorRegistry()
         self.counter = Gauge('g', 'help', registry=self.registry)
         self.requests = requests = []
+
         class TestHandler(BaseHTTPRequestHandler):
             def do_PUT(self):
                 if 'with_basic_auth' in self.requestline and self.headers['authorization'] != 'Basic Zm9vOmJhcg==':
@@ -113,9 +119,11 @@ def do_PUT(self):
 
         httpd = HTTPServer(('localhost', 0), TestHandler)
         self.address = 'http://localhost:{0}'.format(httpd.server_address[1])
+
         class TestServer(threading.Thread):
             def run(self):
                 httpd.handle_request()
+
         self.server = TestServer()
         self.server.daemon = True
         self.server.start()

tests/test_graphite_bridge.py

@@ -8,22 +8,28 @@
 from prometheus_client import Counter, CollectorRegistry
 from prometheus_client.bridge.graphite import GraphiteBridge
 
+
 def fake_timer():
     return 1434898897.5
 
+
 class TestGraphiteBridge(unittest.TestCase):
     def setUp(self):
         self.registry = CollectorRegistry()
 
         self.data = ''
+
         class TCPHandler(SocketServer.BaseRequestHandler):
             def handle(s):
                 self.data = s.request.recv(1024)
+
         server = SocketServer.TCPServer(('', 0), TCPHandler)
+
         class ServingThread(threading.Thread):
             def run(self):
                 server.handle_request()
                 server.socket.close()
+
         self.t = ServingThread()
         self.t.start()
 

tests/test_multiprocess.py

@@ -127,9 +127,7 @@ def test_namespace_subsystem(self):
 
     def test_counter_across_forks(self):
         pid = 0
-        def get_pid():
-            return pid
-        core._ValueClass = core._MultiProcessValue(get_pid)
+        core._ValueClass = core._MultiProcessValue(lambda: pid)
         c1 = Counter('c', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('c'))
         c1.inc(1)
@@ -170,6 +168,7 @@ def test_multi_expansion(self):
     def tearDown(self):
         os.unlink(self.tempfile)
 
+
 class TestUnsetEnv(unittest.TestCase):
     def setUp(self):
         self.registry = CollectorRegistry()

tests/test_parser.py

@@ -92,7 +92,6 @@ def test_untyped(self):
         ]
         self.assertEqual([m], list(families))
 
-
     def test_type_help_switched(self):
         families = text_string_to_metric_families("""# HELP a help
 # TYPE a counter
@@ -244,12 +243,10 @@ class TextCollector(object):
             def collect(self):
                 return families
 
-
         registry = CollectorRegistry()
         registry.register(TextCollector())
         self.assertEqual(text.encode('utf-8'), generate_latest(registry))
 
 
-
 if __name__ == '__main__':
     unittest.main()

tox.ini

@@ -60,11 +60,6 @@ commands =
 ignore =
     D,
     I,
-    E123,
-    E302,
-    E303,
-    E305,
-    E306,
     E402,
     E501,
     E722,