Ticket #17802: pass-the-request-down-to-the-sitemap-callable.diff

django/contrib/sitemaps/views.py

@@ -13 +13 @@
     sites = []
     for section, site in sitemaps.items():
         if callable(site):
-            site = site()
+            site = site(request=request)
         protocol = req_protocol if site.protocol is None else site.protocol
         sitemap_url = urlresolvers.reverse(
                 sitemap_url_name, kwargs={'section': section})
@@ -42 +42 @@
     for site in maps:
         try:
             if callable(site):
-                site = site()
+                site = site(request=request)
             urls.extend(site.get_urls(page=page, site=req_site,
                                       protocol=req_protocol))
         except EmptyPage:

django/contrib/sitemaps/__init__.py

@@ -40 +40 @@
     # http://sitemaps.org/protocol.php#index.
     limit = 50000
 
+    def __init__(self, request=None):
+        self.request = request
+
     # If protocol is None, the URLs in the sitemap will use the protocol
     # with which the sitemap was requested.
     protocol = None
@@ -104 +107 @@
     priority = None
     changefreq = None
 
-    def __init__(self, info_dict, priority=None, changefreq=None):
+    def __init__(self, info_dict, priority=None, changefreq=None, request=None):
         self.queryset = info_dict['queryset']
         self.date_field = info_dict.get('date_field', None)
         self.priority = priority
         self.changefreq = changefreq
+        self.request = request
 
     def items(self):
         # Make sure to return a clone; we don't want premature evaluation.