Remove the by-dict support for labels

Author: alex

README.md

@@ -194,15 +194,6 @@ c.labels(method='get', endpoint='/').inc()
 c.labels(method='post', endpoint='/submit').inc()
 ```
 
-Or as a dict:
-
-```python
-from prometheus_client import Counter
-c = Counter('my_requests_total', 'HTTP Failures', ['method', 'endpoint'])
-c.labels({'method': 'get', 'endpoint': '/'}).inc()
-c.labels({'method': 'post', 'endpoint': '/submit'}).inc()
-```
-
 ### Process Collector
 
 The Python client automatically exports metrics about process CPU usage, RAM,

prometheus_client/core.py

@@ -279,11 +279,7 @@ def labels(self, *labelvalues, **labelkwargs):
         if labelvalues and labelkwargs:
             raise ValueError("Can't pass both *args and **kwargs")
 
-        if len(labelvalues) == 1 and type(labelvalues[0]) == dict:
-            if sorted(labelvalues[0].keys()) != sorted(self._labelnames):
-                raise ValueError('Incorrect label names')
-            labelvalues = tuple([unicode(labelvalues[0][l]) for l in self._labelnames])
-        elif labelkwargs:
+        if labelkwargs:
             if sorted(labelkwargs) != sorted(self._labelnames):
                 raise ValueError('Incorrect label names')
             labelvalues = tuple([unicode(labelkwargs[l]) for l in self._labelnames])

tests/test_core.py

@@ -249,7 +249,7 @@ def test_incorrect_label_count_raises(self):
 
     def test_labels_coerced_to_string(self):
         self.counter.labels(None).inc()
-        self.counter.labels({'l': None}).inc()
+        self.counter.labels(l=None).inc()
         self.assertEqual(2, self.registry.get_sample_value('c', {'l': 'None'}))
 
         self.counter.remove(None)
@@ -259,27 +259,13 @@ def test_non_string_labels_raises(self):
         class Test(object):
             __str__ = None
         self.assertRaises(TypeError, self.counter.labels, Test())
-        self.assertRaises(TypeError, self.counter.labels, {'l': Test()})
+        self.assertRaises(TypeError, self.counter.labels, l=Test())
 
     def test_namespace_subsystem_concatenated(self):
         c = Counter('c', 'help', namespace='a', subsystem='b', registry=self.registry)
         c.inc()
         self.assertEqual(1, self.registry.get_sample_value('a_b_c'))
 
-    def test_labels_by_dict(self):
-        self.counter.labels({'l': 'x'}).inc()
-        self.assertEqual(1, self.registry.get_sample_value('c', {'l': 'x'}))
-        self.assertRaises(ValueError, self.counter.labels, {'l': 'x', 'm': 'y'})
-        self.assertRaises(ValueError, self.counter.labels, {'m': 'y'})
-        self.assertRaises(ValueError, self.counter.labels, {})
-        self.two_labels.labels({'a': 'x', 'b': 'y'}).inc()
-        self.assertEqual(1, self.registry.get_sample_value('two', {'a': 'x', 'b': 'y'}))
-        self.assertRaises(ValueError, self.two_labels.labels, {'a': 'x', 'b': 'y', 'c': 'z'})
-        self.assertRaises(ValueError, self.two_labels.labels, {'a': 'x', 'c': 'z'})
-        self.assertRaises(ValueError, self.two_labels.labels, {'b': 'y', 'c': 'z'})
-        self.assertRaises(ValueError, self.two_labels.labels, {'c': 'z'})
-        self.assertRaises(ValueError, self.two_labels.labels, {})
-
     def test_labels_by_kwarg(self):
         self.counter.labels(l='x').inc()
         self.assertEqual(1, self.registry.get_sample_value('c', {'l': 'x'}))