Ticket #14433: 14433.diff

django/contrib/gis/sitemaps/georss.py

@@ -36 +36 @@
             else:
                 self.locations.append(section)
  
-    def get_urls(self, page=1):
+    def get_urls(self, page=1, site=None):
         """
         This method is overrridden so the appropriate `geo_format` attribute
         is placed on each URL element.
         """
-        urls = Sitemap.get_urls(self, page=page)
+        urls = Sitemap.get_urls(self, page=page, site=site)
         for url in urls: url['geo_format'] = 'georss'
         return urls
 

django/contrib/gis/sitemaps/kml.py

@@ -40 +40 @@
                 raise TypeError('KML Sources must be a model or a 3-tuple.')
         return kml_sources
 
-    def get_urls(self, page=1):
+    def get_urls(self, page=1, site=None):
         """
         This method is overrridden so the appropriate `geo_format` attribute
         is placed on each URL element.
         """
-        urls = Sitemap.get_urls(self, page=page)
+        urls = Sitemap.get_urls(self, page=page, site=site)
         for url in urls: url['geo_format'] = self.geo_format
         return urls
 

django/contrib/gis/sitemaps/views.py

@@ -46 +46 @@
         maps = sitemaps.values()
 
     page = request.GET.get("p", 1)
+    current_site = get_current_site(request)
     for site in maps:
         try:
             if callable(site):
-                urls.extend(site().get_urls(page))
+                urls.extend(site().get_urls(page, current_site))
             else:
-                urls.extend(site.get_urls(page))
+                urls.extend(site.get_urls(page, current_site))
         except EmptyPage:
             raise Http404("Page %s empty" % page)
         except PageNotAnInteger:

django/contrib/sitemaps/__init__.py

@@ -1 @@
-from django.contrib.sites.models import get_current_site
+from django.contrib.sites.models import Site, get_current_site
 from django.core import urlresolvers, paginator
 import urllib
 
@@ -60 +60 @@
         return self._paginator
     paginator = property(_get_paginator)
 
-    def get_urls(self, page=1):
-        current_site = get_current_site(self.request)
+    def get_urls(self, page=1, site=None):
+        if site is None:
+            try:
+                site = Site.objects.get_current()
+            except Site.DoesNotExist:
+                raise ImproperlyConfigured("In order to use Sitemaps you must either use the sites framework or pass in a Site or RequestSite object in your view code.")
         urls = []
         for item in self.paginator.page(page).object_list:
-            loc = "http://%s%s" % (current_site.domain, self.__get('location', item))
+            loc = "http://%s%s" % (site.domain, self.__get('location', item))
             priority = self.__get('priority', item, None)
             url_info = {
                 'location':   loc,
@@ -77 +81 @@
 
 class FlatPageSitemap(Sitemap):
     def items(self):
-        current_site = get_current_site(self.request)
-        if hasattr(current_site, "flatpage_set"):
-            return current_site.flatpage_set.filter(registration_required=False)
-        else:
-            return ()
+        current_site = Site.objects.get_current()
+        return current_site.flatpage_set.filter(registration_required=False)
 
 class GenericSitemap(Sitemap):
     priority = None

django/contrib/sitemaps/views.py

@@ -32 +32 @@
     else:
         maps = sitemaps.values()
     page = request.GET.get("p", 1)
+    current_site = get_current_site(request)
     for site in maps:
-        site.request = request
         try:
             if callable(site):
-                urls.extend(site().get_urls(page))
+                urls.extend(site().get_urls(page, current_site))
             else:
-                urls.extend(site.get_urls(page))
+                urls.extend(site.get_urls(page, current_site))
         except EmptyPage:
             raise Http404("Page %s empty" % page)
         except PageNotAnInteger: