Remove support for Python 2

- Removed use of six
- Removed __future__ imports
- Removed coding cookie comment (Python 3 defaults to utf-8)
- Removed some force_text() calls where the value is known to be str
- Replaced deprecated ugettext with gettext
- Removed object as parent class
- Simplified use of super()
- Updated setup.cfg file to reflect that without Python 2 support, the
  wheel is no longer "universal"
- Updated trove classifiers
- Consistently import ngettext as __ throughout the project
- Run pyupgrade on the project

Author: jdufresne

.travis.yml

@@ -5,8 +5,6 @@ cache: pip
 matrix:
   fast_finish: true
   include:
-    - python: 2.7
-      env: TOXENV=py27-dj111
     - python: 3.4
       env: TOXENV=py34-dj111
     - python: 3.5

Makefile

@@ -7,7 +7,7 @@ style:
 
 style_check:
 	isort -rc -c debug_toolbar example tests
-	black --check debug_toolbar example tests setup.py
+	black --target-version=py34 --check debug_toolbar example tests setup.py
 
 flake8:
 	flake8 debug_toolbar example tests

debug_toolbar/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 __all__ = ["VERSION"]
 
 

debug_toolbar/apps.py

@@ -1,13 +1,11 @@
-from __future__ import absolute_import, unicode_literals
-
 import inspect
 
 from django.apps import AppConfig
 from django.conf import settings
 from django.core.checks import Warning, register
 from django.middleware.gzip import GZipMiddleware
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class DebugToolbarConfig(AppConfig):

debug_toolbar/management/commands/debugsqlshell.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function, unicode_literals
-
 from time import time
 
 import sqlparse
@@ -19,7 +17,7 @@ def execute(self, sql, params=()):
             end_time = time()
             duration = (end_time - start_time) * 1000
             formatted_sql = sqlparse.format(raw_sql, reindent=True)
-            print("%s [%.2fms]" % (formatted_sql, duration))
+            print("{} [{:.2f}ms]".format(formatted_sql, duration))
 
 
 db_backends_utils.CursorDebugWrapper = PrintQueryWrapper

debug_toolbar/middleware.py

@@ -2,14 +2,10 @@
 Debug Toolbar middleware
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import re
+from functools import lru_cache
 
 from django.conf import settings
-from django.utils import six
-from django.utils.encoding import force_text
-from django.utils.lru_cache import lru_cache
 from django.utils.module_loading import import_string
 
 from debug_toolbar import settings as dt_settings
@@ -33,13 +29,13 @@ def get_show_toolbar():
     # If SHOW_TOOLBAR_CALLBACK is a string, which is the recommended
     # setup, resolve it to the corresponding callable.
     func_or_path = dt_settings.get_config()["SHOW_TOOLBAR_CALLBACK"]
-    if isinstance(func_or_path, six.string_types):
+    if isinstance(func_or_path, str):
         return import_string(func_or_path)
     else:
         return func_or_path
 
 
-class DebugToolbarMiddleware(object):
+class DebugToolbarMiddleware:
     """
     Middleware to set up Debug Toolbar on incoming request and render toolbar
     on outgoing response.
@@ -86,7 +82,7 @@ def __call__(self, request):
             response.set_cookie("djdt", "hide", 864000)
 
         # Insert the toolbar in the response.
-        content = force_text(response.content, encoding=response.charset)
+        content = response.content.decode(response.charset)
         insert_before = dt_settings.get_config()["INSERT_BEFORE"]
         pattern = re.escape(insert_before)
         bits = re.split(pattern, content, flags=re.IGNORECASE)

debug_toolbar/panels/__init__.py

@@ -1,12 +1,10 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template.loader import render_to_string
 
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.utils import get_name_from_obj
 
 
-class Panel(object):
+class Panel:
     """
     Base class for panels.
     """
@@ -153,7 +151,7 @@ def record_server_timing(self, key, title, value):
 
         Each call to ``record_stats`` updates the statistics dictionary.
         """
-        data = {key: dict(title=title, value=value)}
+        data = {key: {"title": title, "value": value}}
         self.toolbar.server_timing_stats.setdefault(self.panel_id, {}).update(data)
 
     def get_server_timing_stats(self):

debug_toolbar/panels/cache.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import inspect
 import sys
 import time
@@ -11,7 +9,7 @@
 from django.core.cache.backends.base import BaseCache
 from django.dispatch import Signal
 from django.middleware import cache as middleware_cache
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import gettext_lazy as _, ngettext as __
 
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.panels import Panel
@@ -132,7 +130,7 @@ def decr_version(self, *args, **kwargs):
 
 class CacheHandlerPatch(CacheHandler):
     def __getitem__(self, alias):
-        actual_cache = super(CacheHandlerPatch, self).__getitem__(alias)
+        actual_cache = super().__getitem__(alias)
         return CacheStatTracker(actual_cache)
 
 
@@ -147,7 +145,7 @@ class CachePanel(Panel):
     template = "debug_toolbar/panels/cache.html"
 
     def __init__(self, *args, **kwargs):
-        super(CachePanel, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.total_time = 0
         self.hits = 0
         self.misses = 0
@@ -218,7 +216,7 @@ def _store_call_info(
     @property
     def nav_subtitle(self):
         cache_calls = len(self.calls)
-        return ungettext(
+        return __(
             "%(cache_calls)d call in %(time).2fms",
             "%(cache_calls)d calls in %(time).2fms",
             cache_calls,
@@ -227,11 +225,11 @@ def nav_subtitle(self):
     @property
     def title(self):
         count = len(getattr(settings, "CACHES", ["default"]))
-        return ungettext(
+        return __(
             "Cache calls from %(count)d backend",
             "Cache calls from %(count)d backends",
             count,
-        ) % dict(count=count)
+        ) % {"count": count}
 
     def enable_instrumentation(self):
         if isinstance(middleware_cache.caches, CacheHandlerPatch):

debug_toolbar/panels/headers.py

@@ -1,8 +1,6 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
 
@@ -13,26 +11,24 @@ class HeadersPanel(Panel):
     """
 
     # List of environment variables we want to display
-    ENVIRON_FILTER = set(
-        (
-            "CONTENT_LENGTH",
-            "CONTENT_TYPE",
-            "DJANGO_SETTINGS_MODULE",
-            "GATEWAY_INTERFACE",
-            "QUERY_STRING",
-            "PATH_INFO",
-            "PYTHONPATH",
-            "REMOTE_ADDR",
-            "REMOTE_HOST",
-            "REQUEST_METHOD",
-            "SCRIPT_NAME",
-            "SERVER_NAME",
-            "SERVER_PORT",
-            "SERVER_PROTOCOL",
-            "SERVER_SOFTWARE",
-            "TZ",
-        )
-    )
+    ENVIRON_FILTER = {
+        "CONTENT_LENGTH",
+        "CONTENT_TYPE",
+        "DJANGO_SETTINGS_MODULE",
+        "GATEWAY_INTERFACE",
+        "QUERY_STRING",
+        "PATH_INFO",
+        "PYTHONPATH",
+        "REMOTE_ADDR",
+        "REMOTE_HOST",
+        "REQUEST_METHOD",
+        "SCRIPT_NAME",
+        "SERVER_NAME",
+        "SERVER_PORT",
+        "SERVER_PROTOCOL",
+        "SERVER_SOFTWARE",
+        "TZ",
+    }
 
     title = _("Headers")
 
@@ -51,7 +47,7 @@ def process_request(self, request):
         self.record_stats(
             {"request_headers": self.request_headers, "environ": self.environ}
         )
-        return super(HeadersPanel, self).process_request(request)
+        return super().process_request(request)
 
     def generate_stats(self, request, response):
         self.response_headers = OrderedDict(sorted(response.items()))

debug_toolbar/panels/logging.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 import datetime
 import logging
 
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import gettext_lazy as _, ngettext as __
 
 from debug_toolbar.panels import Panel
 from debug_toolbar.utils import ThreadCollector
@@ -22,7 +20,7 @@ def collect(self, item, thread=None):
         # TODO: Make this check whether SQL panel is enabled
         if item.get("channel", "") == "django.db.backends":
             return
-        super(LogCollector, self).collect(item, thread)
+        super().collect(item, thread)
 
 
 class ThreadTrackingHandler(logging.Handler):
@@ -59,7 +57,7 @@ class LoggingPanel(Panel):
     template = "debug_toolbar/panels/logging.html"
 
     def __init__(self, *args, **kwargs):
-        super(LoggingPanel, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._records = {}
 
     nav_title = _("Logging")
@@ -68,15 +66,15 @@ def __init__(self, *args, **kwargs):
     def nav_subtitle(self):
         records = self._records[threading.currentThread()]
         record_count = len(records)
-        return ungettext("%(count)s message", "%(count)s messages", record_count) % {
+        return __("%(count)s message", "%(count)s messages", record_count) % {
             "count": record_count
         }
 
     title = _("Log messages")
 
     def process_request(self, request):
         collector.clear_collection()
-        return super(LoggingPanel, self).process_request(request)
+        return super().process_request(request)
 
     def generate_stats(self, request, response):
         records = collector.get_collection()

debug_toolbar/panels/profiling.py

@@ -1,13 +1,10 @@
-from __future__ import absolute_import, division, unicode_literals
-
 import cProfile
 import os
 from colorsys import hsv_to_rgb
 from pstats import Stats
 
-from django.utils import six
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.panels import Panel
@@ -23,7 +20,7 @@ def contains_profiler(func_tuple):
     the INVALID_PROFILE_FUNC in any string value of the tuple."""
     has_profiler = False
     for value in func_tuple:
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             has_profiler |= INVALID_PROFILER_FUNC in value
     return has_profiler
 
@@ -40,7 +37,7 @@ def get_root_func(self):
         return self.__root
 
 
-class FunctionCall(object):
+class FunctionCall:
     def __init__(
         self, statobj, func, depth=0, stats=None, id=0, parent_ids=[], hsv=(0, 0.5, 1)
     ):
@@ -60,7 +57,7 @@ def parent_classes(self):
 
     def background(self):
         r, g, b = hsv_to_rgb(*self.hsv)
-        return "rgb(%f%%,%f%%,%f%%)" % (r * 100, g * 100, b * 100)
+        return "rgb({:f}%,{:f}%,{:f}%)".format(r * 100, g * 100, b * 100)
 
     def func_std_string(self):  # match what old profile produced
         func_name = self.func
@@ -156,9 +153,7 @@ class ProfilingPanel(Panel):
 
     def process_request(self, request):
         self.profiler = cProfile.Profile()
-        return self.profiler.runcall(
-            super(ProfilingPanel, self).process_request, request
-        )
+        return self.profiler.runcall(super().process_request, request)
 
     def add_node(self, func_list, func, max_depth, cum_time=0.1):
         func_list.append(func)

debug_toolbar/panels/redirects.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template.response import SimpleTemplateResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
 
@@ -16,11 +14,13 @@ class RedirectsPanel(Panel):
     nav_title = _("Intercept redirects")
 
     def process_request(self, request):
-        response = super(RedirectsPanel, self).process_request(request)
+        response = super().process_request(request)
         if 300 <= int(response.status_code) < 400:
             redirect_to = response.get("Location", None)
             if redirect_to:
-                status_line = "%s %s" % (response.status_code, response.reason_phrase)
+                status_line = "{} {}".format(
+                    response.status_code, response.reason_phrase
+                )
                 cookies = response.cookies
                 context = {"redirect_to": redirect_to, "status_line": status_line}
                 # Using SimpleTemplateResponse avoids running global context processors.

debug_toolbar/panels/request.py

@@ -1,9 +1,6 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.http import Http404
 from django.urls import resolve
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
 from debug_toolbar.utils import get_name_from_obj
@@ -58,7 +55,7 @@ def generate_stats(self, request, response):
                 {
                     "session": [
                         (k, request.session.get(k))
-                        for k in sorted(request.session.keys(), key=force_text)
+                        for k in sorted(request.session.keys())
                     ]
                 }
             )

debug_toolbar/panels/settings.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.debug import get_safe_settings
 
 from debug_toolbar.panels import Panel