From 1d5aac5d1030e5893f78a0f705fb71f116216967 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 17 Oct 2018 12:02:17 +0100 Subject: [PATCH] Remove handling of missing request argument from get_sitemap_urls --- wagtail/contrib/sitemaps/sitemap_generator.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/wagtail/contrib/sitemaps/sitemap_generator.py b/wagtail/contrib/sitemaps/sitemap_generator.py index 6042e8e0b..5203ff93f 100644 --- a/wagtail/contrib/sitemaps/sitemap_generator.py +++ b/wagtail/contrib/sitemaps/sitemap_generator.py @@ -1,10 +1,5 @@ -import warnings - from django.contrib.sitemaps import Sitemap as DjangoSitemap -from wagtail.core.utils import accepts_kwarg -from wagtail.utils.deprecation import RemovedInWagtail24Warning - class Sitemap(DjangoSitemap): @@ -44,15 +39,7 @@ class Sitemap(DjangoSitemap): for item in self.paginator.page(page).object_list: - if not accepts_kwarg(item.get_sitemap_urls, 'request'): - warnings.warn( - "%s.get_sitemap_urls() must be updated to accept an optional " - "'request' keyword argument" % type(item).__name__, - category=RemovedInWagtail24Warning) - - url_info_items = item.get_sitemap_urls() - else: - url_info_items = item.get_sitemap_urls(self.request) + url_info_items = item.get_sitemap_urls(self.request) for url_info in url_info_items: urls.append(url_info)