Merge pull request #1128 from jdufresne/static-panel

Handle removed staticfiles.templatetags in Django 3.0

Author: matthiask

debug_toolbar/panels/staticfiles.py

@@ -5,7 +5,6 @@
 
 from django.conf import settings
 from django.contrib.staticfiles import finders, storage
-from django.contrib.staticfiles.templatetags import staticfiles
 from django.core.files.storage import get_storage_class
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import LazyObject
@@ -97,14 +96,10 @@ def __init__(self, *args, **kwargs):
         self._paths = {}
 
     def enable_instrumentation(self):
-        storage.staticfiles_storage = (
-            staticfiles.staticfiles_storage
-        ) = DebugConfiguredStorage()
+        storage.staticfiles_storage = DebugConfiguredStorage()
 
     def disable_instrumentation(self):
-        storage.staticfiles_storage = (
-            staticfiles.staticfiles_storage
-        ) = _original_storage
+        storage.staticfiles_storage = _original_storage
 
     @property
     def num_used(self):

docs/changes.rst

@@ -4,6 +4,8 @@ Change log
 UNRELEASED
 ----------
 
+* Updated ``StaticFilesPanel`` to be compatible with Django 3.0.
+
 1.11 (2018-12-03)
 -----------------