8000 Fix lint related to vertical whitespace (#246) · inxming/client_python@55f1055 · GitHub
[go: up one dir, main page]
Skip to content

Commit 55f1055

Browse files
bz2brian-brazil
bz2
authored and
brian-brazil
committed
Fix lint related to vertical whitespace (prometheus#246)
* Fix lint related to vertical whitespace Resolves E123, E302, E303, E305, and E306.
1 parent 4ba6c90 commit 55f1055

9 files changed

+22
-16
lines changed

‎prometheus_client/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ def restricted_registry(self, names):
121121
m = Metric(metric.name, metric.documentation, metric.type)
122122
m.samples = samples
123123
metrics.append(m)
124+
124125
class RestrictedRegistry(object):
125126
def collect(self):
126127
return metrics
@@ -435,7 +436,6 @@ def __init__(self, typ, metric_name, name, labelnames, labelvalues, multiprocess
435436
self.__reset()
436437
values.append(self)
437438

438-
439439
def __reset(self):
440440
typ, metric_name, name, labelnames, labelvalues, multiprocess_mode = self._params
441441
if typ == 'gauge':

‎prometheus_client/decorator.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def getargspec(f):
7777
spec = getfullargspec(f)
7878
return ArgSpec(spec.args, spec.varargs, spec.varkw, spec.defaults)
7979

80+
8081
DEF = re.compile('\s*def\s*([_\w][_\w\d]*)\s*\(')
8182

8283

@@ -276,6 +277,7 @@ def __call__(self, func):
276277
func, "with _self_: return _func_(%(shortsignature)s)",
277278
dict(_self_=self, _func_=func), __wrapped__=func)
278279

280+
279281
init = getfullargspec(_GeneratorContextManager.__init__)
280282
n_args = len(init.args)
281283
if n_args == 2 and not init.varargs: # (self, genobj) Python 2.7

‎prometheus_client/multiprocess.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def collect(self):
7575
samples.setdefault((name, labels), 0.0)
7676
samples[(name, labels)] += value
7777

78-
7978
# Accumulate bucket values.
8079
if metric.type == 'histogram':
8180
for labels, values in buckets.items():

‎prometheus_client/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def build_metric(name, documentation, typ, samples):
197197
'gauge': [''],
198198
'summary': ['_count', '_sum', ''],
199199
'histogram': ['_count', '_sum', '_bucket'],
200-
}.get(typ, [''])
200+
}.get(typ, [''])
201201
allowed_names = [name + n for n in allowed_names]
202202
else:
203203
# Ignore other comment tokens

‎tests/test_exposition.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from http.server import BaseHTTPRequestHandler
2525
from http.server import HTTPServer
2626

27+
2728
class TestGenerateText(unittest.TestCase):
2829
def setUp(self):
2930
self.registry = CollectorRegistry()
@@ -79,16 +80,20 @@ def test_escaping(self):
7980
self.assertEqual(b'# HELP cc A\\ncount\\\\er\n# TYPE cc counter\ncc{a="\\\\x\\n\\""} 1.0\n', generate_latest(self.registry))
8081

8182
def test_nonnumber(self):
82-
class MyNumber():
83+
84+
class MyNumber(object):
8385
def __repr__(self):
8486
return "MyNumber(123)"
87+
8588
def __float__(self):
8689
return 123.0
87-
class MyCollector():
90+
91+
class MyCollector(object):
8892
def collect(self):
8993
metric = Metric("nonnumber", "Non number", 'untyped')
9094
metric.add_sample("nonnumber", {}, MyNumber())
9195
yield metric
96+
9297
self.registry.register(MyCollector())
9398
self.assertEqual(b'# HELP nonnumber Non number\n# TYPE nonnumber untyped\nnonnumber 123.0\n', generate_latest(self.registry))
9499

@@ -98,6 +103,7 @@ def setUp(self):
98103
self.registry = CollectorRegistry()
99104
self.counter = Gauge('g', 'help', registry=self.registry)
100105
self.requests = requests = []
106+
101107
class TestHandler(BaseHTTPRequestHandler):
102108
def do_PUT(self):
103109
if 'with_basic_auth' in self.requestline and self.headers['authorization'] != 'Basic Zm9vOmJhcg==':
@@ -113,9 +119,11 @@ def do_PUT(self):
113119

114120
httpd = HTTPServer(('localhost', 0), TestHandler)
115121
self.address = 'http://localhost:{0}'.format(httpd.server_address[1])
122+
116123
class TestServer(threading.Thread):
117124
def run(self):
118125
httpd.handle_request()
126+
119127
self.server = TestServer()
120128
self.server.daemon = True
121129
self.server.start()

‎tests/test_graphite_bridge.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,28 @@
88
from prometheus_client import Counter, CollectorRegistry
99
from prometheus_client.bridge.graphite import GraphiteBridge
1010

11+
1112
def fake_timer():
1213
return 1434898897.5
1314

15+
1416
class TestGraphiteBridge(unittest.TestCase):
1517
def setUp(self):
1618
self.registry = CollectorRegistry()
1719

1820
self.data = ''
21+
1922
class TCPHandler(SocketServer.BaseRequestHandler):
2023
def handle(s):
2124
self.data = s.request.recv(1024)
25+
2226
server = SocketServer.TCPServer(('', 0), TCPHandler)
27+
2328
class ServingThread(threading.Thread):
2429
def run(self):
2530
server.handle_request()
2631
server.socket.close()
32+
2733
self.t = ServingThread()
2834
self.t.start()
2935

‎tests/test_multiprocess.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ def test_namespace_subsystem(self):
127127

128128
def test_counter_across_forks(self):
129129
pid = 0
130-
def get_pid():
131-
return pid
132-
core._ValueClass = core._MultiProcessValue(get_pid)
130+
core._ValueClass = core._MultiProcessValue(lambda: pid)
133131
c1 = Counter('c', 'help', registry=None)
134132
self.assertEqual(0, self.registry.get_sample_value('c'))
135133
c1.inc(1)
@@ -170,6 +168,7 @@ def test_multi_expansion(self):
170168
def tearDown(self):
171169
os.unlink(self.tempfile)
172170

171+
173172
class TestUnsetEnv(unittest.TestCase):
174173
def setUp(self):
175174
self.registry = CollectorRegistry()

‎tests/test_parser.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ def test_untyped(self):
9292
]
9393
self.assertEqual([m], list(families))
9494

95-
9695
def test_type_help_switched(self):
9796
families = text_string_to_metric_families("""# HELP a help
9897
# TYPE a counter
@@ -244,12 +243,10 @@ class TextCollector(object):
244243
def collect(self):
245244
return families
246245

247-
248246
registry = CollectorRegistry()
249247
registry.register(TextCollector())
250248
self.assertEqual(text.encode('utf-8'), generate_latest(registry))
251249

252250

253-
254251
if __name__ == '__main__':
255252
unittest.main()

‎tox.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ commands =
6060
ignore =
6161
D,
6262
I,
63-
E123,
64-
E302,
65-
E303,
66-
E305,
67-
E306,
6863
E402,
6964
E501,
7065
E722,

0 commit comments

Comments
 (0)
0