Fix lint around unused and star imports (#245)

Resolves F401, F403, and F405.

Removes unused imports. Makes test imports explicit and consistent.

Author: bz2

prometheus_client/core.py

@@ -9,20 +9,19 @@
 import os
 import re
 import struct
+import sys
 import time
 import types
 
-try:
-    from BaseHTTPServer import BaseHTTPRequestHandler
-except ImportError:
-    # Python 3
-    unicode = str
-
 from threading import Lock
 from timeit import default_timer
 
 from .decorator import decorate
 
+
+if sys.version_info > (3,):
+    unicode = str
+
 _METRIC_NAME_RE = re.compile(r'^[a-zA-Z_:][a-zA-Z0-9_:]*$')
 _METRIC_LABEL_NAME_RE = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*$')
 _RESERVED_METRIC_LABEL_NAME_RE = re.compile(r'^__.*$')

prometheus_client/multiprocess.py

@@ -5,7 +5,6 @@
 import glob
 import json
 import os
-import shelve
 
 from . import core
 

setup.py

@@ -1,4 +1,3 @@
-import os
 from setuptools import setup
 
 setup(

tests/test_core.py

@@ -1,12 +1,23 @@
 from __future__ import unicode_literals
 
 import inspect
-import os
-import threading
 import time
 import unittest
 
-from prometheus_client.core import *
+from prometheus_client.core import (
+    CollectorRegistry,
+    Counter,
+    CounterMetricFamily,
+    Gauge,
+    GaugeMetricFamily,
+    Histogram,
+    HistogramMetricFamily,
+    Metric,
+    Summary,
+    SummaryMetricFamily,
+    UntypedMetricFamily,
+)
+
 
 class TestCounter(unittest.TestCase):
     def setUp(self):

tests/test_multiprocess.py

@@ -1,30 +1,40 @@
 from __future__ import unicode_literals
+
 import os
 import shutil
 import tempfile
-import time
 import unittest
 
-import prometheus_client
-from prometheus_client.core import *
-from prometheus_client.multiprocess import *
+from prometheus_client import core
+from prometheus_client.core import (
+    CollectorRegistry,
+    Counter,
+    Gauge,
+    Histogram,
+    Summary,
+)
+from prometheus_client.multiprocess import (
+    mark_process_dead,
+    MultiProcessCollector,
+)
+
 
 class TestMultiProcess(unittest.TestCase):
     def setUp(self):
         self.tempdir = tempfile.mkdtemp()
         os.environ['prometheus_multiproc_dir'] = self.tempdir
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 123)
+        core._ValueClass = core._MultiProcessValue(lambda: 123)
         self.registry = CollectorRegistry()
         MultiProcessCollector(self.registry, self.tempdir)
 
     def tearDown(self):
         del os.environ['prometheus_multiproc_dir']
         shutil.rmtree(self.tempdir)
-        prometheus_client.core._ValueClass = prometheus_client.core._MutexValue
+        core._ValueClass = core._MutexValue
 
     def test_counter_adds(self):
         c1 = Counter('c', 'help', registry=None)
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         c2 = Counter('c', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('c'))
         c1.inc(1)
@@ -33,7 +43,7 @@ def test_counter_adds(self):
 
     def test_summary_adds(self):
         s1 = Summary('s', 'help', registry=None)
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         s2 = Summary('s', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('s_count'))
         self.assertEqual(0, self.registry.get_sample_value('s_sum'))
@@ -44,7 +54,7 @@ def test_summary_adds(self):
 
     def test_histogram_adds(self):
         h1 = Histogram('h', 'help', registry=None)
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         h2 = Histogram('h', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('h_count'))
         self.assertEqual(0, self.registry.get_sample_value('h_sum'))
@@ -57,7 +67,7 @@ def test_histogram_adds(self):
 
     def test_gauge_all(self):
         g1 = Gauge('g', 'help', registry=None)
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         g2 = Gauge('g', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '123'}))
         self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '456'}))
@@ -69,7 +79,7 @@ def test_gauge_all(self):
 
     def test_gauge_liveall(self):
         g1 = Gauge('g', 'help', registry=None, multiprocess_mode='liveall')
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         g2 = Gauge('g', 'help', registry=None, multiprocess_mode='liveall')
         self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '123'}))
         self.assertEqual(0, self.registry.get_sample_value('g', {'pid': '456'}))
@@ -83,7 +93,7 @@ def test_gauge_liveall(self):
 
     def test_gauge_min(self):
         g1 = Gauge('g', 'help', registry=None, multiprocess_mode='min')
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         g2 = Gauge('g', 'help', registry=None, multiprocess_mode='min')
         self.assertEqual(0, self.registry.get_sample_value('g'))
         g1.set(1)
@@ -92,7 +102,7 @@ def test_gauge_min(self):
 
     def test_gauge_max(self):
         g1 = Gauge('g', 'help', registry=None, multiprocess_mode='max')
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         g2 = Gauge('g', 'help', registry=None, multiprocess_mode='max')
         self.assertEqual(0, self.registry.get_sample_value('g'))
         g1.set(1)
@@ -101,7 +111,7 @@ def test_gauge_max(self):
 
     def test_gauge_livesum(self):
         g1 = Gauge('g', 'help', registry=None, multiprocess_mode='livesum')
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(lambda: 456)
+        core._ValueClass = core._MultiProcessValue(lambda: 456)
         g2 = Gauge('g', 'help', registry=None, multiprocess_mode='livesum')
         self.assertEqual(0, self.registry.get_sample_value('g'))
         g1.set(1)
@@ -119,7 +129,7 @@ def test_counter_across_forks(self):
         pid = 0
         def get_pid():
             return pid
-        prometheus_client.core._ValueClass = prometheus_client.core._MultiProcessValue(get_pid)
+        core._ValueClass = core._MultiProcessValue(get_pid)
         c1 = Counter('c', 'help', registry=None)
         self.assertEqual(0, self.registry.get_sample_value('c'))
         c1.inc(1)
@@ -168,19 +178,12 @@ def setUp(self):
 
     def test_unset_syncdir_env(self):
         self.assertRaises(
-            ValueError,
-            MultiProcessCollector,
-            self.registry
-        )
+            ValueError, MultiProcessCollector, self.registry)
 
     def test_file_syncpath(self):
         registry = CollectorRegistry()
         self.assertRaises(
-            ValueError,
-            MultiProcessCollector,
-            registry,
-            self.tmpfl
-        )
+            ValueError, MultiProcessCollector, registry, self.tmpfl)
 
     def tearDown(self):
         os.remove(self.tmpfl)

tests/test_parser.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import math
 import sys
 
 if sys.version_info < (2, 7):
@@ -8,9 +9,20 @@
 else:
     import unittest
 
-from prometheus_client.core import *
-from prometheus_client.exposition import *
-from prometheus_client.parser import *
+from prometheus_client.core import (
+    CollectorRegistry,
+    CounterMetricFamily,
+    GaugeMetricFamily,
+    HistogramMetricFamily,
+    Metric,
+    SummaryMetricFamily,
+)
+from prometheus_client.exposition import (
+    generate_latest,
+)
+from prometheus_client.parser import (
+    text_string_to_metric_families,
+)
 
 
 class TestParse(unittest.TestCase):
@@ -120,8 +132,8 @@ def test_labels_and_infinite(self):
 a{foo="baz"} -Inf
 """)
         metric_family = CounterMetricFamily("a", "help", labels=["foo"])
-        metric_family.add_metric(["bar"], core._INF)
-        metric_family.add_metric(["baz"], core._MINUS_INF)
+        metric_family.add_metric(["bar"], float('inf'))
+        metric_family.add_metric(["baz"], float('-inf'))
         self.assertEqual([metric_family], list(families))
 
     def test_spaces(self):

tox.ini

@@ -69,9 +69,6 @@ ignore =
     E501,
     E722,
     E741,
-    F401,
-    F403,
-    F405,
     F841,
     W293,
     W503