8000 Fix lint around unused and star imports (#245) · jcsdatera/client_python@c59f436 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit c59f436

Browse files
bz2brian-brazil
bz2
authored and
brian-brazil
committed
Fix lint around unused and star imports (prometheus#245)
Resolves F401, F403, and F405. Removes unused imports. Makes test imports explicit and consistent.
1 parent 8c1cddd commit c59f436

File tree

7 files changed

+63
-43
lines changed

7 files changed

+63
-43
lines changed

‎prometheus_client/core.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99
import os
1010
import re
1111
import struct
12+
import sys
1213
import time
1314
import types
1415

15-
try:
16-
from BaseHTTPServer import BaseHTTPRequestHandler
17-
except ImportError:
18-
# Python 3
19-
unicode = str
20-
2116
from threading import Lock
2217
from timeit import default_timer
2318

2419
from .decorator import decorate
2520

21+
22+
if sys.version_info > (3,):
23+
unicode = str
24+
2625
_METRIC_NAME_RE = re.compile(r'^[a-zA-Z_:][a-zA-Z0-9_:]*$')
2726
_METRIC_LABEL_NAME_RE = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*$')
2827
_RESERVED_METRIC_LABEL_NAME_RE = re.compile(r'^__.*$')

‎prometheus_client/multiprocess.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import glob
66
import json
77
import os
8-
import shelve
98

109
from . import core
1110

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import os
21
from setuptools import setup
32

43
setup(

‎tests/test_core.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
from __future__ import unicode_literals
22

33
import inspect
4-
import os
5-
import threading
64
import time
75
import unittest
86

9-
from prometheus_client.core import *
7+
from prometheus_client.core import (
8+
CollectorRegistry,
9+
Counter,
10+
CounterMetricFamily,
11+
Gauge,
12+
GaugeMetricFamily,
13+
Histogram,
14+
HistogramMetricFamily,
15+
Metric,
16+
Summary,
17+
SummaryMetricFamily,
18+
UntypedMetricFamily,
19+
)
20+
1021

1122
class TestCounter(unittest.TestCase):
1223
def setUp(self):

‎tests/test_multiprocess.py

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
11
from __future__ import unicode_literals
2+
23
import os
34
import shutil
45
import tempfile
5-
import time
66
import unittest
77

8-
import prometheus_client
9-
from prometheus_client.core import *
10-
from prometheus_client.multiprocess import *
8+
from prometheus_client import core
9+
from prometheus_client.core import (
10+
CollectorRegistry,
11+
Counter,
12+
Gauge,
13+
Histogram,
14+
Summary,
15+
)
16+
from prometheus_client.multiprocess import (
17+
mark_process_dead,
18+
MultiProcessCollector,
19+
)
20+
1121

1222
class TestMultiProcess(unittest.TestCase):
1323
def setUp(self):
1424
self.tempdir = tempfile.mkdtemp()
1525
os.environ['prometheus_multiproc_dir'] = self.tempdir
16-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 123)
26+
core._ValueClass = core._MultiProcessValue(lambda: 123)
1727
self.registry = CollectorRegistry()
1828
MultiProcessCollector(self.registry, self.tempdir)
1929

2030
def tearDown(self):
2131
del os.environ['prometheus_multiproc_dir']
2232
shutil.rmtree(self.tempdir)
23-
prometheus_client.core._ValueClass = prometheus_client.core._MutexValue
33+
core._ValueClass = core._MutexValue
2434

2535
def test_counter_adds(self):
2636
c1 = Counter('c', 'help', registry=None)
27-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
37+
core._ValueClass = core._MultiProcessValue(lambda: 456)
2838
c2 = Counter('c', 'help', registry=None)
2939
self.assertEqual(0, self.registry.get_sample_value('c'))
3040
c1.inc(1)
@@ -33,7 +43,7 @@ def test_counter_adds(self):
3343

3444
def test_summary_adds(self):
3545
s1 = Summary('s', 'help', registry=None)
36-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
46+
core._ValueClass = core._MultiProcessValue(lambda: 456)
3747
s2 = Summary('s', 'help', registry=None)
3848
self.assertEqual(0, self.registry.get_sample_value('s_count'))
3949
self.assertEqual(0, self.registry.get_sample_value('s_sum'))
@@ -44,7 +54,7 @@ def test_summary_adds(self):
4454

4555
def test_histogram_adds(self):
4656
h1 = Histogram('h', 'help', registry=None)
47-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
57+
core._ValueClass = core._MultiProcessValue(lambda: 456)
4858
h2 = Histogram('h', 'help', registry=None)
4959
self.assertEqual(0, self.registry.get_sample_value('h_count'))
5060
self.assertEqual(0, self.registry.get_sample_value('h_sum'))
@@ -57,7 +67,7 @@ def test_histogram_adds(self):
5767

5868
def test_gauge_all(self):
5969
g1 = Gauge('g', 'help', registry=None)
60-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
70+
core._ValueClass = core._MultiProcessValue(lambda: 456)
6171
g2 = Gauge('g', 'help', registry=None)
6272
self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '123'}))
6373
self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '456'}))
@@ -69,7 +79,7 @@ def test_gauge_all(self):
6979

7080
def test_gauge_liveall(self):
7181
g1 = Gauge('g', 'help', registry=None, multiprocess_mode='liveall')
72-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
82+
core._ValueClass = core._MultiProcessValue(lambda: 456)
7383
g2 = Gauge('g', 'help', registry=None, multiprocess_mode='liveall')
7484
self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '123'}))
7585
self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '456'}))
@@ -83,7 +93,7 @@ def test_gauge_liveall(self):
8393

8494
def test_gauge_min(self):
8595
g1 = Gauge('g', 'help', registry=None, multiprocess_mode='min')
86-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
96+
core._ValueClass = core._MultiProcessValue(lambda: 456)
8797
g2 = Gauge('g', 'help', registry=None, multiprocess_mode='min')
8898
self.assertEqual(0, self.registry.get_sample_value('g'))
8999
g1.set(1)
@@ -92,7 +102,7 @@ def test_gauge_min(self):
92102

93103
def test_gauge_max(self):
94104
g1 = Gauge('g', 'help', registry=None, multiprocess_mode='max')
95-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
105+
core._ValueClass = core._MultiProcessValue(lambda: 456)
96106
g2 = Gauge('g', 'help', registry=None, multiprocess_mode='max')
97107
self.assertEqual(0, self.registry.get_sample_value('g'))
98108
g1.set(1)
@@ -101,7 +111,7 @@ def test_gauge_max(self):
101111

102112
def test_gauge_livesum(self):
103113
g1 = Gauge('g', 'help', registry=None, multiprocess_mode='livesum')
104-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
114+
core._ValueClass = core._MultiProcessValue(lambda: 456)
105115
g2 = Gauge('g', 'help', registry=None, multiprocess_mode='livesum')
106116
self.assertEqual(0, self.registry.get_sample_value('g'))
107117
g1.set(1)
@@ -119,7 +129,7 @@ def test_counter_across_forks(self):
119129
pid = 0
120130
def get_pid():
121131
return pid
122-
prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(get_pid)
132+
core._ValueClass = core._MultiProcessValue(get_pid)
123133
c1 = Counter('c', 'help', registry=None)
124134
self.assertEqual(0, self.registry.get_sample_value('c'))
125135
c1.inc(1)
@@ -168,19 +178,12 @@ def setUp(self):
168178

169179
def test_unset_syncdir_env(self):
170180
self.assertRaises(
171-
ValueError,
172-
MultiProcessCollector,
173-
self.registry
174-
)
181+
ValueError, MultiProcessCollector, self.registry)
175182

176183
def test_file_syncpath(self):
177184
registry = CollectorRegistry()
178185
self.assertRaises(
179-
ValueError,
180-
MultiProcessCollector,
181-
registry,
182-
self.tmpfl
183-
)
186+
ValueError, MultiProcessCollector, registry, self.tmpfl)
184187

185188
def tearDown(self):
186189
os.remove(self.tmpfl)

‎tests/test_parser.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import unicode_literals
22

3+
import math
34
import sys
45

56
if sys.version_info < (2, 7):
@@ -8,9 +9,20 @@
89
else:
910
import unittest
1011

11-
from prometheus_client.core import *
12-
from prometheus_client.exposition import *
13-
from prometheus_client.parser import *
12+
from prometheus_client.core import (
13+
CollectorRegistry,
14+
CounterMetricFamily,
15+
GaugeMetricFamily,
16+
HistogramMetricFamily,
17+
Metric,
18+
SummaryMetricFamily,
19+
)
20+
from prometheus_client.exposition import (
21+
generate_latest,
22+
)
23+
from prometheus_client.parser import (
24+
text_string_to_metric_families,
25+
)
1426

1527

1628
class TestParse(unittest.TestCase):
@@ -120,8 +132,8 @@ def test_labels_and_infinite(self):
120132
a{foo="baz"} -Inf
121133
""")
122134
metric_family = CounterMetricFamily("a", "help", labels=["foo"])
123-
metric_family.add_metric(["bar"], core._INF)
124-
metric_family.add_metric(["baz"], core._MINUS_INF)
135+
metric_family.add_metric(["bar"], float('inf'))
136+
metric_family.add_metric(["baz"], float('-inf'))
125137
self.assertEqual([metric_family], list(families))
126138

127139
def test_spaces(self):

‎tox.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ ignore =
6969
E501,
7070
E722,
7171
E741,
72-
F401,
73-
F403,
74-
F405,
7572
F841,
7673
W293,
7774
W503

0 commit comments

Comments
 (0)
0