Ticket #25989: views.py.diff

views.py

@@ -58 +58 @@
         maps = sitemaps.values()
     page = request.GET.get("p", 1)
 
+    lastmod = None
+
     urls = []
     for site in maps:
         try:
@@ -65 +67 @@
                 site = site()
             urls.extend(site.get_urls(page=page, site=req_site,
                                       protocol=req_protocol))
+
+            if hasattr(site, 'latest_lastmod'):
+                site_lastmod = site.latest_lastmod
+
+                if type(site_lastmod) is datetime.date:
+                    site_lastmod = datetime.datetime(site_lastmod.year,
+                                                        site_lastmod.month,
+                                                        site_lastmod.day)
+
+                if lastmod is None or lastmod < site_lastmod:
+                    lastmod = site_lastmod
+
         except EmptyPage:
             raise Http404("Page %s empty" % page)
         except PageNotAnInteger:
             raise Http404("No page '%s'" % page)
     response = TemplateResponse(request, template_name, {'urlset': urls},
                                 content_type=content_type)
-    if hasattr(site, 'latest_lastmod'):
-        # if latest_lastmod is defined for site, set header so as
+    if lastmod is not None:
+        # if lastmod is defined for at least one site, set header so as
         # ConditionalGetMiddleware is able to send 304 NOT MODIFIED
-        lastmod = site.latest_lastmod
         response['Last-Modified'] = http_date(
             timegm(
                 lastmod.utctimetuple() if isinstance(lastmod, datetime.datetime)