Ticket #10909: 10909.diff

django/contrib/sitemaps/__init__.py

@@ -27 +27 @@
     if sitemap_url is None:
         raise SitemapNotFound("You didn't provide a sitemap_url, and the sitemap URL couldn't be auto-detected.")
 
-    from django.contrib.sites.models import Site
-    current_site = Site.objects.get_current()
-    url = "http://%s%s" % (current_site.domain, sitemap_url)
-    params = urllib.urlencode({'sitemap':url})
+    if '://' not in sitemap_url:
+        from django.contrib.sites.models import Site
+        current_site = Site.objects.get_current()
+        sitemap_url = "http://%s%s" % (current_site.domain, sitemap_url)
+    params = urllib.urlencode({'sitemap': sitemap_url})
     urllib.urlopen("%s?%s" % (ping_url, params))
 
 class Sitemap(object):
@@ -60 +61 @@
     paginator = property(_get_paginator)
 
     def get_urls(self, page=1):
-        from django.contrib.sites.models import Site
-        current_site = Site.objects.get_current()
         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" % (self.get_domain(),
+                                   self.__get('location', item))
             url_info = {
                 'location':   loc,
                 'lastmod':    self.__get('lastmod', item, None),
@@ -74 +74 @@
             urls.append(url_info)
         return urls
 
+    def get_domain(self):
+        # This method can be overridden to avoid the requirement of the sites
+        # contrib application.
+        from django.contrib.sites.models import Site
+        return Site.objects.get_current().domain
+
 class FlatPageSitemap(Sitemap):
     def items(self):
         from django.contrib.sites.models import Site