Upgrade Python syntax with pyupgrade --py36-plus

Author: hugovk

prometheus_client/bridge/graphite.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-from __future__ import unicode_literals
 
 import logging
 import re
@@ -22,7 +21,7 @@ def _sanitize(s):
 
 class _RegularPush(threading.Thread):
     def __init__(self, pusher, interval, prefix):
-        super(_RegularPush, self).__init__()
+        super().__init__()
         self._pusher = pusher
         self._interval = interval
         self._prefix = prefix
@@ -41,11 +40,11 @@ def run(self):
                 time.sleep(wait_until - now)
             try:
                 self._pusher.push(prefix=self._prefix)
-            except IOError:
+            except OSError:
                 logging.exception("Push failed")
 
 
-class GraphiteBridge(object):
+class GraphiteBridge:
     def __init__(self, address, registry=REGISTRY, timeout_seconds=30, _timer=time.time, tags=False):
         self._address = address
         self._registry = registry
@@ -76,8 +75,7 @@ def push(self, prefix=''):
                             for k, v in sorted(s.labels.items())])
                 else:
                     labelstr = ''
-                output.append('{0}{1}{2} {3} {4}\n'.format(
-                    prefixstr, _sanitize(s.name), labelstr, float(s.value), now))
+                output.append(f'{prefixstr}{_sanitize(s.name)}{labelstr} {float(s.value)} {now}\n')
 
         conn = socket.create_connection(self._address, self._timeout)
         conn.sendall(''.join(output).encode('ascii'))

prometheus_client/context_managers.py

@@ -1,11 +1,9 @@
-from __future__ import unicode_literals
-
 from timeit import default_timer
 
 from .decorator import decorate
 
 
-class ExceptionCounter(object):
+class ExceptionCounter:
     def __init__(self, counter, exception):
         self._counter = counter
         self._exception = exception
@@ -25,7 +23,7 @@ def wrapped(func, *args, **kwargs):
         return decorate(f, wrapped)
 
 
-class InprogressTracker(object):
+class InprogressTracker:
     def __init__(self, gauge):
         self._gauge = gauge
 
@@ -43,7 +41,7 @@ def wrapped(func, *args, **kwargs):
         return decorate(f, wrapped)
 
 
-class Timer(object):
+class Timer:
     def __init__(self, callback):
         self._callback = callback
 

prometheus_client/core.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from .metrics import Counter, Enum, Gauge, Histogram, Info, Summary
 from .metrics_core import (
     CounterMetricFamily, GaugeHistogramMetricFamily, GaugeMetricFamily,

prometheus_client/decorator.py

@@ -31,7 +31,6 @@
 Decorator module, see http://pypi.python.org/pypi/decorator
 for the documentation.
 """
-from __future__ import print_function
 
 import collections
 import inspect
@@ -63,7 +62,7 @@ def getargspec(f):
 
 
 # basic functionality
-class FunctionMaker(object):
+class FunctionMaker:
     """
     An object with the ability to create functions with a given signature.
     It has attributes name, doc, module, signature, defaults, dict and
@@ -100,7 +99,7 @@ def __init__(self, func=None, name=None, signature=None,
                     allargs.append('*')  # single star syntax
                 for a in self.kwonlyargs:
                     allargs.append('%s=None' % a)
-                    allshortargs.append('%s=%s' % (a, a))
+                    allshortargs.append(f'{a}={a}')
                 if self.varkw:
                     allargs.append('**' + self.varkw)
                     allshortargs.append('**' + self.varkw)
@@ -154,7 +153,7 @@ def make(self, src_templ, evaldict=None, addsource=False, **attrs):
                               self.shortsignature.split(',')])
         for n in names:
             if n in ('_func_', '_call_'):
-                raise NameError('%s is overridden in\n%s' % (n, src))
+                raise NameError(f'{n} is overridden in\n{src}')
 
         if not src.endswith('\n'):  # add a newline for old Pythons
             src += '\n'
@@ -329,7 +328,7 @@ def ancestors(*types):
                 n_vas = len(vas)
                 if n_vas > 1:
                     raise RuntimeError(
-                        'Ambiguous dispatch for %s: %s' % (t, vas))
+                        f'Ambiguous dispatch for {t}: {vas}')
                 elif n_vas == 1:
                     va, = vas
                     mro = type('t', (t, va), {}).__mro__[1:]

prometheus_client/exposition.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 from contextlib import closing
 from http.server import BaseHTTPRequestHandler
@@ -19,7 +17,7 @@
 from .registry import REGISTRY
 from .utils import floatToGoString
 
-CONTENT_TYPE_LATEST = str('text/plain; version=0.0.4; charset=utf-8')
+CONTENT_TYPE_LATEST = 'text/plain; version=0.0.4; charset=utf-8'
 """Content type of the latest text format"""
 PYTHON376_OR_NEWER = sys.version_info > (3, 7, 5)
 
@@ -85,7 +83,7 @@ def _bake_output(registry, accept_header, params):
     if 'name[]' in params:
         registry = registry.restricted_registry(params['name[]'])
     output = encoder(registry)
-    return str('200 OK'), (str('Content-Type'), content_type), output
+    return '200 OK', ('Content-Type', content_type), output
 
 
 def make_wsgi_app(registry=REGISTRY):
@@ -97,8 +95,8 @@ def prometheus_app(environ, start_response):
         params = parse_qs(environ.get('QUERY_STRING', ''))
         if environ['PATH_INFO'] == '/favicon.ico':
             # Serve empty response for browsers
-            status = str('200 OK')
-            header = (str(''), str(''))
+            status = '200 OK'
+            header = ('', '')
             output = b''
         else:
             # Bake output
@@ -143,17 +141,16 @@ def generate_latest(registry=REGISTRY):
     def sample_line(line):
         if line.labels:
             labelstr = '{{{0}}}'.format(','.join(
-                ['{0}="{1}"'.format(
+                ['{}="{}"'.format(
                     k, v.replace('\\', r'\\').replace('\n', r'\n').replace('"', r'\"'))
                     for k, v in sorted(line.labels.items())]))
         else:
             labelstr = ''
         timestamp = ''
         if line.timestamp is not None:
             # Convert to milliseconds.
-            timestamp = ' {0:d}'.format(int(float(line.timestamp) * 1000))
-        return '{0}{1} {2}{3}\n'.format(
-            line.name, labelstr, floatToGoString(line.value), timestamp)
+            timestamp = f' {int(float(line.timestamp) * 1000):d}'
+        return f'{line.name}{labelstr} {floatToGoString(line.value)}{timestamp}\n'
 
     output = []
     for metric in registry.collect():
@@ -175,9 +172,9 @@ def sample_line(line):
             elif mtype == 'unknown':
                 mtype = 'untyped'
 
-            output.append('# HELP {0} {1}\n'.format(
+            output.append('# HELP {} {}\n'.format(
                 mname, metric.documentation.replace('\\', r'\\').replace('\n', r'\n')))
-            output.append('# TYPE {0} {1}\n'.format(mname, mtype))
+            output.append(f'# TYPE {mname} {mtype}\n')
 
             om_samples = {}
             for s in metric.samples:
@@ -193,9 +190,9 @@ def sample_line(line):
             raise
 
         for suffix, lines in sorted(om_samples.items()):
-            output.append('# HELP {0}{1} {2}\n'.format(metric.name, suffix,
+            output.append('# HELP {}{} {}\n'.format(metric.name, suffix,
                                                        metric.documentation.replace('\\', r'\\').replace('\n', r'\n')))
-            output.append('# TYPE {0}{1} gauge\n'.format(metric.name, suffix))
+            output.append(f'# TYPE {metric.name}{suffix} gauge\n')
             output.extend(lines)
     return ''.join(output).encode('utf-8')
 
@@ -250,7 +247,7 @@ def write_to_textfile(path, registry):
 
     This is intended for use with the Node exporter textfile collector.
     The path must end in .prom for the textfile collector to process it."""
-    tmppath = '%s.%s.%s' % (path, os.getpid(), threading.current_thread().ident)
+    tmppath = f'{path}.{os.getpid()}.{threading.current_thread().ident}'
     with open(tmppath, 'wb') as f:
         f.write(generate_latest(registry))
 
@@ -270,8 +267,7 @@ def handle():
             request.add_header(k, v)
         resp = build_opener(base_handler).open(request, timeout=timeout)
         if resp.code >= 400:
-            raise IOError("error talking to pushgateway: {0} {1}".format(
-                resp.code, resp.msg))
+            raise OSError(f"error talking to pushgateway: {resp.code} {resp.msg}")
 
     return handle
 
@@ -308,7 +304,7 @@ def handle():
         """Handler that implements HTTP Basic Auth.
         """
         if username is not None and password is not None:
-            auth_value = '{0}:{1}'.format(username, password).encode('utf-8')
+            auth_value = f'{username}:{password}'.encode()
             auth_token = base64.b64encode(auth_value)
             auth_header = b'Basic ' + auth_token
             headers.append(['Authorization', auth_header])
@@ -418,8 +414,8 @@ def _use_gateway(method, gateway, job, registry, grouping_key, timeout, handler)
             PYTHON376_OR_NEWER
             and gateway_url.scheme not in ['http', 'https']
     ):
-        gateway = 'http://{0}'.format(gateway)
-    url = '{0}/metrics/{1}/{2}'.format(gateway, *_escape_grouping_key("job", job))
+        gateway = f'http://{gateway}'
+    url = '{}/metrics/{}/{}'.format(gateway, *_escape_grouping_key("job", job))
 
     data = b''
     if method != 'DELETE':
@@ -428,7 +424,7 @@ def _use_gateway(method, gateway, job, registry, grouping_key, timeout, handler)
     if grouping_key is None:
         grouping_key = {}
     url += ''.join(
-        '/{0}/{1}'.format(*_escape_grouping_key(str(k), str(v)))
+        '/{}/{}'.format(*_escape_grouping_key(str(k), str(v)))
         for k, v in sorted(grouping_key.items()))
 
     handler(

prometheus_client/gc_collector.py

@@ -1,13 +1,11 @@
-from __future__ import unicode_literals
-
 import gc
 import platform
 
 from .metrics_core import CounterMetricFamily
 from .registry import REGISTRY
 
 
-class GCCollector(object):
+class GCCollector:
     """Collector for Garbage collection statistics."""
 
     def __init__(self, registry=REGISTRY):

prometheus_client/metrics.py

@@ -55,7 +55,7 @@ def _validate_exemplar(exemplar):
         raise ValueError('Exemplar labels have %d UTF-8 characters, exceeding the limit of 128')
 
 
-class MetricWrapperBase(object):
+class MetricWrapperBase:
     _type = None
     _reserved_labelnames = ()
 
@@ -88,11 +88,11 @@ def collect(self):
         return [metric]
 
     def __str__(self):
-        return "{0}:{1}".format(self._type, self._name)
+        return f"{self._type}:{self._name}"
 
     def __repr__(self):
         metric_type = type(self)
-        return "{0}.{1}({2})".format(metric_type.__module__, metric_type.__name__, self._name)
+        return f"{metric_type.__module__}.{metric_type.__name__}({self._name})"
 
     def __init__(self,
                  name,
@@ -154,7 +154,7 @@ def labels(self, *labelvalues, **labelkwargs):
             raise ValueError('No label names were set when constructing %s' % self)
 
         if self._labelvalues:
-            raise ValueError('%s already has labels set (%s); can not chain calls to .labels()' % (
+            raise ValueError('{} already has labels set ({}); can not chain calls to .labels()'.format(
                 self,
                 dict(zip(self._labelnames, self._labelvalues))
             ))
@@ -344,7 +344,7 @@ def __init__(self,
         self._multiprocess_mode = multiprocess_mode
         if multiprocess_mode not in self._MULTIPROC_MODES:
             raise ValueError('Invalid multiprocess mode: ' + multiprocess_mode)
-        super(Gauge, self).__init__(
+        super().__init__(
             name=name,
             documentation=documentation,
             labelnames=labelnames,
@@ -537,7 +537,7 @@ def __init__(self,
                  buckets=DEFAULT_BUCKETS,
                  ):
         self._prepare_buckets(buckets)
-        super(Histogram, self).__init__(
+        super().__init__(
             name=name,
             documentation=documentation,
             labelnames=labelnames,
@@ -641,7 +641,7 @@ def _metric_init(self):
     def info(self, val):
         """Set info metric."""
         if self._labelname_set.intersection(val.keys()):
-            raise ValueError('Overlapping labels for Info metric, metric: %s child: %s' % (
+            raise ValueError('Overlapping labels for Info metric, metric: {} child: {}'.format(
                 self._labelnames, val))
         with self._lock:
             self._value = dict(val)
@@ -677,7 +677,7 @@ def __init__(self,
                  _labelvalues=None,
                  states=None,
                  ):
-        super(Enum, self).__init__(
+        super().__init__(
             name=name,
             documentation=documentation,
             labelnames=labelnames,
@@ -688,9 +688,9 @@ def __init__(self,
             _labelvalues=_labelvalues,
         )
         if name in labelnames:
-            raise ValueError('Overlapping labels for Enum metric: %s' % (name,))
+            raise ValueError(f'Overlapping labels for Enum metric: {name}')
         if not states:
-            raise ValueError('No states provided for Enum metric: %s' % (name,))
+            raise ValueError(f'No states provided for Enum metric: {name}')
         self._kwargs['states'] = self._states = states
 
     def _metric_init(self):

prometheus_client/metrics_core.py

@@ -11,7 +11,7 @@
 RESERVED_METRIC_LABEL_NAME_RE = re.compile(r'^__.*$')
 
 
-class Metric(object):
+class Metric:
     """A single metric family and its samples.
 
     This is intended only for internal use by the instrumentation client.
@@ -50,7 +50,7 @@ def __eq__(self, other):
                 and self.samples == other.samples)
 
     def __repr__(self):
-        return "Metric(%s, %s, %s, %s, %s)" % (
+        return "Metric({}, {}, {}, {}, {})".format(
             self.name,
             self.documentation,
             self.type,

prometheus_client/mmap_dict.py

@@ -45,7 +45,7 @@ def _read_all_values(data, used=0):
         pos += 8
 
 
-class MmapedDict(object):
+class MmapedDict:
     """A dict of doubles, backed by an mmapped file.
 
     The file starts with a 4 byte int, indicating how much of it is used.
@@ -94,7 +94,7 @@ def _init_value(self, key):
         encoded = key.encode('utf-8')
         # Pad to be 8-byte aligned.
         padded = encoded + (b' ' * (8 - (len(encoded) + 4) % 8))
-        value = struct.pack('i{0}sd'.format(len(padded)).encode(), len(encoded), padded, 0.0)
+        value = struct.pack(f'i{len(padded)}sd'.encode(), len(encoded), padded, 0.0)
         while self._used + len(value) > self._capacity:
             self._capacity *= 2
             self._f.truncate(self._capacity)