8000 Make indentation multiple of 4 spaces (#241) · jcsdatera/client_python@55eab1f · GitHub
[go: up one dir, main page]
Skip to content

Commit 55eab1f

Browse files
bz2brian-brazil
bz2
authored and
brian-brazil
committed
Make indentation multiple of 4 spaces (prometheus#241)
Fixes lint errors E111 and E114, no semantic changes.
1 parent 9838337 commit 55eab1f

File tree

8 files changed

+44
-46
lines changed

8 files changed

+44
-46
lines changed

‎prometheus_client/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@
5050
start_http_server(8000)
5151
import time
5252
while True:
53-
time.sleep(1)
53+
time.sleep(1)

‎prometheus_client/core.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ def __init__(self, name, documentation, value=None, labels=None):
209209
if labels is not None and value is not None:
210210
raise ValueError('Can only specify at most one of value and labels.')
211211
if labels is None:
212-
labels = []
212+
labels = []
213213
self._labelnames = tuple(labels)
214214
if value is not None:
215-
self.add_metric([], value)
215+
self.add_metric([], value)
216216

217217
def add_metric(self, labels, value):
218218
'''Add a metric to the metric family.
@@ -234,10 +234,10 @@ def __init__(self, name, documentation, value=None, labels=None):
234234
if labels is not None and value is not None:
235235
raise ValueError('Can only specify at most one of value and labels.')
236236
if labels is None:
237-
labels = []
237+
labels = []
238238
self._labelnames = tuple(labels)
239239
if value is not None:
240-
self.add_metric([], value)
240+
self.add_metric([], value)
241241

242242
def add_metric(self, labels, value):
243243
'''Add a metric to the metric family.
@@ -261,10 +261,10 @@ def __init__(self, name, documentation, count_value=None, sum_value=None, labels
261261
if labels is not None and count_value is not None:
262262
raise ValueError('Can only specify at most one of value and labels.')
263263
if labels is None:
264-
labels = []
264+
labels = []
265265
self._labelnames = tuple(labels)
266266
if count_value is not None:
267-
self.add_metric([], count_value, sum_value)
267+
self.add_metric([], count_value, sum_value)
268268

269269
def add_metric(self, labels, count_value, sum_value):
270270
'''Add a metric to the metric family.
@@ -290,10 +290,10 @@ def __init__(self, name, documentation, buckets=None, sum_value=None, labels=Non
290290
if labels is not None and buckets is not None:
291291
raise ValueError('Can only specify at most one of buckets and labels.')
292292
if labels is None:
293-
labels = []
293+
labels = []
294294
self._labelnames = tuple(labels)
295295
if buckets is not None:
296-
self.add_metric([], buckets, sum_value)
296+
self.add_metric([], buckets, sum_value)
297297

298298
def add_metric(self, labels, buckets, sum_value):
299299
'''Add a metric to the metric family.
@@ -305,7 +305,7 @@ def add_metric(self, labels, buckets, sum_value):
305305
sum_value: The sum value of the metric.
306306
'''
307307
for bucket, value in buckets:
308-
self.samples.append((self.name + '_bucket', dict(list(zip(self._labelnames, labels)) + [('le', bucket)]), value))
308+
self.samples.append((self.name + '_bucket', dict(list(zip(self._labelnames, labels)) + [('le', bucket)]), value))
309309
# +Inf is last and provides the count value.
310310
self.samples.append((self.name + '_count', dict(zip(self._labelnames, labels)), buckets[-1][1]))
311311
self.samples.append((self.name + '_sum', dict(zip(self._labelnames, labels)), sum_value))
@@ -317,20 +317,20 @@ class _MutexValue(object):
317317
_multiprocess = False
318318

319319
def __init__(self, typ, metric_name, name, labelnames, labelvalues, **kwargs):
320-
self._value = 0.0
321-
self._lock = Lock()
320+
self._value = 0.0
321+
self._lock = Lock()
322322

323323
def inc(self, amount):
324-
with self._lock:
325-
self._value += amount
324+
with self._lock:
325+
self._value += amount
326326

327327
def set(self, value):
328-
with self._lock:
329-
self._value = value
328+
with self._lock:
329+
self._value = value
330330

331331
def get(self):
332-
with self._lock:
333-
return self._value
332+
with self._lock:
333+
return self._value
334334

335335

336336
class _MmapedDict(object):
@@ -882,7 +882,7 @@ def __init__(self, name, labelnames, labelvalues, buckets=(.005, .01, .025, .05,
882882
self._buckets = []
883883
bucket_labelnames = labelnames + ('le',)
884884
for b in buckets:
885-
self._buckets.append(_ValueClass(self._type, name, name + '_bucket', bucket_labelnames, labelvalues + (_floatToGoString(b),)))
885+
self._buckets.append(_ValueClass(self._type, name, name + '_bucket', bucket_labelnames, labelvalues + (_floatToGoString(b),)))
886886

887887
def observe(self, amount):
888888
'''Observe the given amount.'''

‎prometheus_client/multiprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, registry, path=None):
1919
raise ValueError('env prometheus_multiproc_dir is not set or not a directory')
2020
self._path = path
2121
if registry:
22-
registry.register(self)
22+
registry.register(self)
2323

2424
def collect(self):
2525
metrics = {}

‎prometheus_client/parser.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def text_string_to_metric_families(text):
1717
See text_fd_to_metric_families.
1818
"""
1 10000 919
for metric_family in text_fd_to_metric_families(StringIO.StringIO(text)):
20-
yield metric_family
20+
yield metric_family
2121

2222

2323
def _unescape_help(text):
@@ -34,10 +34,10 @@ def _unescape_help(text):
3434
result.append('\\' + char)
3535
slash = False
3636
else:
37-
if char == '\\':
38-
slash = True
39-
else:
40-
result.append(char)
37+
if char == '\\':
38+
slash = True
39+
else:
40+
result.append(char)
4141

4242
if slash:
4343
result.append('\\')
@@ -180,9 +180,9 @@ def build_metric(name, documentation, typ, samples):
180180
samples = []
181181
allowed_names = [parts[2]]
182182
if len(parts) == 4:
183-
documentation = _unescape_help(parts[3])
183+
documentation = _unescape_help(parts[3])
184184
else:
185-
documentation = ''
185+
documentation = ''
186186
elif parts[1] == 'TYPE':
187187
if parts[2] != name:
188188
if name != '':
@@ -208,17 +208,17 @@ def build_metric(name, documentation, typ, samples):
208208
else:
209209
sample = _parse_sample(line)
210210
if sample[0] not in allowed_names:
211-
if name != '':
212-
yield build_metric(name, documentation, typ, samples)
213-
# New metric, yield immediately as untyped singleton
214-
name = ''
215-
documentation = ''
216-
typ = 'untyped'
217-
samples = []
218-
allowed_names = []
219-
yield build_metric(sample[0], documentation, typ, [sample])
211+
if name != '':
212+
yield build_metric(name, documentation, typ, samples)
213+
# New metric, yield immediately as untyped singleton
214+
name = ''
215+
documentation = ''
216+
typ = 'untyped'
217+
samples = []
218+
allowed_names = []
219+
yield build_metric(sample[0], documentation, typ, [sample])
220220
else:
221-
samples.append(sample)
221+
samples.append(sample)
222222

223223
if name != '':
224224
yield build_metric(name, documentation, typ, samples)

‎tests/test_exposition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ def test_escaping(self):
8181
def test_nonnumber(self):
8282
class MyNumber():
8383
def __repr__(self):
84-
return "MyNumber(123)"
84+
return "MyNumber(123)"
8585
def __float__(self):
86-
return 123.0
86+
return 123.0
8787
class MyCollector():
8888
def collect(self):
8989
metric = Metric("nonnumber", "Non number", 'untyped')

‎tests/test_multiprocess.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ def test_gauge_livesum(self):
111111
self.assertEqual(2, self.registry.get_sample_value('g'))
112112

113113
def test_namespace_subsystem(self):
114-
c1 = Counter('c', 'help', registry=None, namespace='ns', subsystem='ss')
115-
c1.inc(1)
116-
self.assertEqual(1, self.registry.< 57AE span class="pl-c1">get_sample_value('ns_ss_c'))
114+
c1 = Counter('c', 'help', registry=None, namespace='ns', subsystem='ss')
115+
c1.inc(1)
116+
self.assertEqual(1, self.registry.get_sample_value('ns_ss_c'))
117117

118118
def test_counter_across_forks(self):
119119
pid = 0

‎tests/test_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ def test_roundtrip(self):
229229
families = list(text_string_to_metric_families(text))
230230

231231
class TextCollector(object):
232-
def collect(self):
233-
return families
232+
def collect(self):
233+
return families
234234

235235

236236
registry = CollectorRegistry()

‎tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ commands =
6060
ignore =
6161
D,
6262
I,
63-
E111,
64-
E114,
6563
E123,
6664
E126,
6765
E127,

0 commit comments

Comments
 (0)
0