From 1f7e16a1725c1ef7e2d8976c344a3659702e92f8 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 26 Oct 2018 13:38:15 +0200
Subject: [PATCH] Eliminate imports of django.contrib.staticfiles.templatetags

This is dropped in favour of django.templatetags.static in Django 3.0
---
 wagtail/admin/menu.py                           | 2 +-
 wagtail/admin/templatetags/wagtailadmin_tags.py | 2 +-
 wagtail/core/blocks/list_block.py               | 2 +-
 wagtail/core/blocks/stream_block.py             | 2 +-
 wagtail/core/blocks/struct_block.py             | 2 +-
 wagtail/tests/testapp/wagtail_hooks.py          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wagtail/admin/menu.py b/wagtail/admin/menu.py
index 9f76c1b5ac..1c2e6f9023 100644
--- a/wagtail/admin/menu.py
+++ b/wagtail/admin/menu.py
@@ -1,7 +1,7 @@
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.forms import Media, MediaDefiningClass
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
+from django.templatetags.static import static
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
 
diff --git a/wagtail/admin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py
index 8af9ccd355..6392477e4f 100644
--- a/wagtail/admin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/admin/templatetags/wagtailadmin_tags.py
@@ -5,9 +5,9 @@ from django.conf import settings
 from django.contrib.admin.utils import quote
 from django.contrib.humanize.templatetags.humanize import intcomma
 from django.contrib.messages.constants import DEFAULT_TAGS as MESSAGE_TAGS
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.template.defaultfilters import stringfilter
 from django.template.loader import render_to_string
+from django.templatetags.static import static
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
diff --git a/wagtail/core/blocks/list_block.py b/wagtail/core/blocks/list_block.py
index 9e71d6035d..3aa3959f3c 100644
--- a/wagtail/core/blocks/list_block.py
+++ b/wagtail/core/blocks/list_block.py
@@ -1,8 +1,8 @@
 from django import forms
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.exceptions import ValidationError
 from django.forms.utils import ErrorList
 from django.template.loader import render_to_string
+from django.templatetags.static import static
 from django.utils.html import format_html, format_html_join
 from django.utils.safestring import mark_safe
 
diff --git a/wagtail/core/blocks/stream_block.py b/wagtail/core/blocks/stream_block.py
index d971c54241..c1a9ee8bb3 100644
--- a/wagtail/core/blocks/stream_block.py
+++ b/wagtail/core/blocks/stream_block.py
@@ -3,10 +3,10 @@ from collections import OrderedDict, defaultdict
 from collections.abc import Sequence
 
 from django import forms
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
 from django.forms.utils import ErrorList
 from django.template.loader import render_to_string
+from django.templatetags.static import static
 from django.utils.html import format_html_join
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
diff --git a/wagtail/core/blocks/struct_block.py b/wagtail/core/blocks/struct_block.py
index 8ec75c05cb..28ab79e775 100644
--- a/wagtail/core/blocks/struct_block.py
+++ b/wagtail/core/blocks/struct_block.py
@@ -1,10 +1,10 @@
 import collections
 
 from django import forms
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.exceptions import ValidationError
 from django.forms.utils import ErrorList
 from django.template.loader import render_to_string
+from django.templatetags.static import static
 from django.utils.functional import cached_property
 from django.utils.html import format_html, format_html_join
 
diff --git a/wagtail/tests/testapp/wagtail_hooks.py b/wagtail/tests/testapp/wagtail_hooks.py
index 8f515639b6..6b819637da 100644
--- a/wagtail/tests/testapp/wagtail_hooks.py
+++ b/wagtail/tests/testapp/wagtail_hooks.py
@@ -1,6 +1,6 @@
 from django import forms
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.http import HttpResponse
+from django.templatetags.static import static
 
 import wagtail.admin.rich_text.editors.draftail.features as draftail_features
 from wagtail.admin.menu import MenuItem