From 2404cd5b0684ee01f3efb919122016078277889a Mon Sep 17 00:00:00 2001 From: Maykel Moya Date: Tue, 17 Mar 2015 17:26:42 +0100 Subject: [PATCH 1/2] Fix argument name --- prometheus_client/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus_client/__init__.py b/prometheus_client/__init__.py index c650c6d1..7d4fbea8 100644 --- a/prometheus_client/__init__.py +++ b/prometheus_client/__init__.py @@ -42,7 +42,7 @@ def register(self, collector): with self._lock: self._collectors.add(collector) - def unregister(self, metric): + def unregister(self, collector): '''Remove a collector from the registry.''' with self._lock: self._collectors.remove(collector) From 7c327aefd92781dfdc3d7d356d3681c86de1b116 Mon Sep 17 00:00:00 2001 From: Maykel Moya Date: Tue, 17 Mar 2015 17:43:10 +0100 Subject: [PATCH 2/2] Raise a defined exception InvalidLabelName is undefined, just raise a ValueError with a consistent message. --- prometheus_client/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus_client/__init__.py b/prometheus_client/__init__.py index 7d4fbea8..416c25c7 100644 --- a/prometheus_client/__init__.py +++ b/prometheus_client/__init__.py @@ -102,7 +102,7 @@ def __init__(self, wrappedClass, labelnames, **kwargs): for l in labelnames: if l.startswith('__'): - raise InvalidLabelName(l) + raise ValueError('Invalid label metric name: ' + l) def labels(self, *labelvalues): '''Return the child for the given labelset.'''