Use python 3 code style.

asherf · asherf · commit 67758a117a7d · 2020-06-19T09:04:29.000-07:00
diff --git a/django_prometheus/cache/backends/django_memcached_consul.py b/django_prometheus/cache/backends/django_memcached_consul.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django_memcached_consul import memcached
 from django_prometheus.cache.metrics import (
     django_cache_get_total,
@@ -13,7 +11,7 @@ class MemcachedCache(memcached.MemcachedCache):
 
     def get(self, key, default=None, version=None):
         django_cache_get_total.labels(backend="django_memcached_consul").inc()
-        cached = super(MemcachedCache, self).get(key, default=None, version=version)
+        cached = super().get(key, default=None, version=version)
         if cached is not None:
             django_cache_hits_total.labels(backend="django_memcached_consul").inc()
         else:
diff --git a/django_prometheus/cache/backends/filebased.py b/django_prometheus/cache/backends/filebased.py
@@ -11,7 +11,7 @@ class FileBasedCache(filebased.FileBasedCache):
 
     def get(self, key, default=None, version=None):
         django_cache_get_total.labels(backend="filebased").inc()
-        cached = super(FileBasedCache, self).get(key, default=None, version=version)
+        cached = super().get(key, default=None, version=version)
         if cached is not None:
             django_cache_hits_total.labels(backend="filebased").inc()
         else:
diff --git a/django_prometheus/cache/backends/locmem.py b/django_prometheus/cache/backends/locmem.py
@@ -11,7 +11,7 @@ class LocMemCache(locmem.LocMemCache):
 
     def get(self, key, default=None, version=None):
         django_cache_get_total.labels(backend="locmem").inc()
-        cached = super(LocMemCache, self).get(key, default=None, version=version)
+        cached = super().get(key, default=None, version=version)
         if cached is not None:
             django_cache_hits_total.labels(backend="locmem").inc()
         else:
diff --git a/django_prometheus/cache/backends/memcached.py b/django_prometheus/cache/backends/memcached.py
@@ -11,7 +11,7 @@ class MemcachedCache(memcached.MemcachedCache):
 
     def get(self, key, default=None, version=None):
         django_cache_get_total.labels(backend="memcached").inc()
-        cached = super(MemcachedCache, self).get(key, default=None, version=version)
+        cached = super().get(key, default=None, version=version)
         if cached is not None:
             django_cache_hits_total.labels(backend="memcached").inc()
         else:
diff --git a/django_prometheus/db/backends/postgis/base.py b/django_prometheus/db/backends/postgis/base.py
@@ -5,7 +5,7 @@
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_connection_params(self):
-        conn_params = super(DatabaseWrapper, self).get_connection_params()
+        conn_params = super().get_connection_params()
         conn_params["cursor_factory"] = ExportingCursorWrapper(
             psycopg2.extensions.cursor, "postgis", self.vendor,
         )
diff --git a/django_prometheus/db/backends/postgresql/base.py b/django_prometheus/db/backends/postgresql/base.py
@@ -11,7 +11,7 @@ class DatabaseFeatures(base.DatabaseFeatures):
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_connection_params(self):
-        conn_params = super(DatabaseWrapper, self).get_connection_params()
+        conn_params = super().get_connection_params()
         conn_params["cursor_factory"] = ExportingCursorWrapper(
             psycopg2.extensions.cursor, self.alias, self.vendor
         )
diff --git a/django_prometheus/db/common.py b/django_prometheus/db/common.py
@@ -8,7 +8,7 @@
 )
 
 
-class ExceptionCounterByType(object):
+class ExceptionCounterByType:
     """A context manager that counts exceptions by type.
 
     Exceptions increment the provided counter, whose last label's name
@@ -36,13 +36,13 @@ def __exit__(self, typ, value, traceback):
             self._counter.labels(**self._labels).inc()
 
 
-class DatabaseWrapperMixin(object):
+class DatabaseWrapperMixin:
     """Extends the DatabaseWrapper to count connections and cursors."""
 
     def get_new_connection(self, *args, **kwargs):
         connections_total.labels(self.alias, self.vendor).inc()
         try:
-            return super(DatabaseWrapperMixin, self).get_new_connection(*args, **kwargs)
+            return super().get_new_connection(*args, **kwargs)
         except Exception:
             connection_errors_total.labels(self.alias, self.vendor).inc()
             raise
@@ -68,16 +68,14 @@ def execute(self, *args, **kwargs):
             with query_duration_seconds.labels(**labels).time(), (
                 ExceptionCounterByType(errors_total, extra_labels=labels)
             ):
-                return super(CursorWrapper, self).execute(*args, **kwargs)
+                return super().execute(*args, **kwargs)
 
         def executemany(self, query, param_list, *args, **kwargs):
             execute_total.labels(alias, vendor).inc(len(param_list))
             execute_many_total.labels(alias, vendor).inc(len(param_list))
             with query_duration_seconds.labels(**labels).time(), (
                 ExceptionCounterByType(errors_total, extra_labels=labels)
             ):
-                return super(CursorWrapper, self).executemany(
-                    query, param_list, *args, **kwargs
-                )
+                return super().executemany(query, param_list, *args, **kwargs)
 
     return CursorWrapper
diff --git a/django_prometheus/exports.py b/django_prometheus/exports.py
@@ -1,6 +1,5 @@
 import logging
 import os
-import socket
 import threading
 
 import prometheus_client
@@ -52,7 +51,7 @@ class PrometheusEndpointServer(threading.Thread):
 
     def __init__(self, httpd, *args, **kwargs):
         self.httpd = httpd
-        super(PrometheusEndpointServer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def run(self):
         self.httpd.serve_forever()
@@ -86,7 +85,7 @@ def SetupPrometheusEndpointOnPortRange(port_range, addr=""):
     for port in port_range:
         try:
             httpd = HTTPServer((addr, port), prometheus_client.MetricsHandler)
-        except (OSError, socket.error):
+        except OSError:
             # Python 2 raises socket.error, in Python 3 socket.error is an
             # alias for OSError
             continue  # Try next port
diff --git a/django_prometheus/middleware.py b/django_prometheus/middleware.py
@@ -26,7 +26,7 @@
 )
 
 
-class Metrics(object):
+class Metrics:
     _instance = None
 
     @classmethod
@@ -190,7 +190,7 @@ class PrometheusBeforeMiddleware(MiddlewareMixin):
     metrics_cls = Metrics
 
     def __init__(self, get_response=None):
-        super(PrometheusBeforeMiddleware, self).__init__(get_response)
+        super().__init__(get_response)
         self.metrics = self.metrics_cls.get_instance()
 
     def process_request(self, request):
@@ -214,7 +214,7 @@ class PrometheusAfterMiddleware(MiddlewareMixin):
     metrics_cls = Metrics
 
     def __init__(self, get_response=None):
-        super(PrometheusAfterMiddleware, self).__init__(get_response)
+        super().__init__(get_response)
         self.metrics = self.metrics_cls.get_instance()
 
     def _transport(self, request):
diff --git a/django_prometheus/models.py b/django_prometheus/models.py
@@ -37,17 +37,17 @@ class User(ExportModelOperationsMixin('user'), Model):
     model_updates.labels(model_name)
     model_deletes.labels(model_name)
 
-    class Mixin(object):
+    class Mixin:
         def _do_insert(self, *args, **kwargs):
             model_inserts.labels(model_name).inc()
-            return super(Mixin, self)._do_insert(*args, **kwargs)
+            return super()._do_insert(*args, **kwargs)
 
         def _do_update(self, *args, **kwargs):
             model_updates.labels(model_name).inc()
-            return super(Mixin, self)._do_update(*args, **kwargs)
+            return super()._do_update(*args, **kwargs)
 
         def delete(self, *args, **kwargs):
             model_deletes.labels(model_name).inc()
-            return super(Mixin, self).delete(*args, **kwargs)
+            return super().delete(*args, **kwargs)
 
     return Mixin
diff --git a/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py b/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py
@@ -21,7 +21,7 @@ class CustomMetrics(Metrics):
     def register_metric(self, metric_cls, name, documentation, labelnames=(), **kwargs):
         if name in EXTENDED_METRICS:
             labelnames.extend(("view_type", "user_agent_type"))
-        return super(CustomMetrics, self).register_metric(
+        return super().register_metric(
             metric_cls, name, documentation, labelnames=labelnames, **kwargs
         )
 
@@ -38,9 +38,7 @@ def label_metric(self, metric, request, response=None, **labels):
         if metric._name in EXTENDED_METRICS:
             new_labels = {"view_type": "foo", "user_agent_type": "browser"}
             new_labels.update(labels)
-        return super(AppMetricsAfterMiddleware, self).label_metric(
-            metric, request, response=response, **new_labels
-        )
+        return super().label_metric(metric, request, response=response, **new_labels)
 
 
 @override_settings(
@@ -52,7 +50,7 @@ def label_metric(self, metric, request, response=None, **labels):
 class TestMiddlewareMetricsWithCustomLabels(PrometheusTestCaseMixin, SimpleTestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestMiddlewareMetricsWithCustomLabels, cls).setUpClass()
+        super().setUpClass()
         # Allow CustomMetrics to be used
         for metric in Metrics._instance.__dict__.values():
             if isinstance(metric, MetricWrapperBase):
diff --git a/django_prometheus/tests/end2end/testapp/test_migrations.py b/django_prometheus/tests/end2end/testapp/test_migrations.py
@@ -1,14 +1,9 @@
-import sys
+from unittest.mock import MagicMock
 
 from django.test import SimpleTestCase
 from django_prometheus.migrations import ExportMigrationsForDatabase
 from django_prometheus.testutils import PrometheusTestCaseMixin
 
-if sys.version_info[:2] >= (3, 0):
-    from unittest.mock import MagicMock
-else:
-    from mock import MagicMock
-
 
 def M(metric_name):
     """Make a full metric name from a short metric name.
diff --git a/django_prometheus/tests/test_exports.py b/django_prometheus/tests/test_exports.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 import socket
+from unittest.mock import ANY, MagicMock, call, patch
 
 from django_prometheus.exports import SetupPrometheusEndpointOnPortRange
-from mock import ANY, MagicMock, call, patch
 
 
 @patch("django_prometheus.exports.HTTPServer")
diff --git a/django_prometheus/tests/test_testutils.py b/django_prometheus/tests/test_testutils.py
@@ -12,7 +12,7 @@ class SomeTestCase(PrometheusTestCaseMixin):
 
     def __init__(self):
         self.passes = True
-        super(SomeTestCase, self).__init__()
+        super().__init__()
 
     def assertEqual(self, left, right, *args, **kwargs):
         self.passes = self.passes and (left == right)
@@ -63,10 +63,10 @@ def testGetMetricVector(self):
         )
         assert sorted(
             [
-                ({"labelred": u"pink", "labelblue": u"indigo"}, 1),
-                ({"labelred": u"pink", "labelblue": u"royal"}, 2),
-                ({"labelred": u"carmin", "labelblue": u"indigo"}, 3),
-                ({"labelred": u"carmin", "labelblue": u"royal"}, 4),
+                ({"labelred": "pink", "labelblue": "indigo"}, 1),
+                ({"labelred": "pink", "labelblue": "royal"}, 2),
+                ({"labelred": "carmin", "labelblue": "indigo"}, 3),
+                ({"labelred": "carmin", "labelblue": "royal"}, 4),
             ],
             key=itemgetter(1),
         ) == sorted(vector, key=itemgetter(1))
diff --git a/django_prometheus/testutils.py b/django_prometheus/testutils.py
@@ -26,7 +26,7 @@
 """
 
 
-class PrometheusTestCaseMixin(object):
+class PrometheusTestCaseMixin:
     """A collection of utilities that make it easier to write test cases
     that interact with metrics.
     """
@@ -84,14 +84,17 @@ def formatLabels(self, labels):
         Out:
           '{method="GET",port="80"}'
         """
-        return "{%s}" % ",".join(['%s="%s"' % (k, v) for k, v in labels.items()])
+        return "{%s}" % ",".join([f'{k}="{v}"' for k, v in labels.items()])
 
     def formatVector(self, vector):
         """Formats a list of (labels, value) where labels is a dict into a
         human-readable representation.
         """
         return "\n".join(
-            ["%s = %s" % (self.formatLabels(labels), value) for labels, value in vector]
+            [
+                "{} = {}".format(self.formatLabels(labels), value)
+                for labels, value in vector
+            ]
         )
 
     def assertMetricEquals(

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):`
`7`	`7`	`def get_connection_params(self):`
`8`		`- conn_params = super(DatabaseWrapper, self).get_connection_params()`
	`8`	`+ conn_params = super().get_connection_params()`
`9`	`9`	`conn_params["cursor_factory"] = ExportingCursorWrapper(`
`10`	`10`	`psycopg2.extensions.cursor, "postgis", self.vendor,`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class DatabaseFeatures(base.DatabaseFeatures):`
`11`	`11`
`12`	`12`	`class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):`
`13`	`13`	`def get_connection_params(self):`
`14`		`- conn_params = super(DatabaseWrapper, self).get_connection_params()`
	`14`	`+ conn_params = super().get_connection_params()`
`15`	`15`	`conn_params["cursor_factory"] = ExportingCursorWrapper(`
`16`	`16`	`psycopg2.extensions.cursor, self.alias, self.vendor`
`17`	`17`	`)`