Upgrade to Django 1.11

- Database integration yet to be tested

19 files changed, 0 insertions, 618 deletions

diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/__init__.py b/lib/python2.7/site-packages/django/contrib/sitemaps/__init__.py
deleted file mode 100644
index 72c1932..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/__init__.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from django.contrib.sites.models import Site
-from django.core import urlresolvers, paginator
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.six.moves.urllib.parse import urlencode
-from django.utils.six.moves.urllib.request import urlopen
-
-PING_URL = "http://www.google.com/webmasters/tools/ping"
-
-class SitemapNotFound(Exception):
-    pass
-
-def ping_google(sitemap_url=None, ping_url=PING_URL):
-    """
-    Alerts Google that the sitemap for the current site has been updated.
-    If sitemap_url is provided, it should be an absolute path to the sitemap
-    for this site -- e.g., '/sitemap.xml'. If sitemap_url is not provided, this
-    function will attempt to deduce it by using urlresolvers.reverse().
-    """
-    if sitemap_url is None:
-        try:
-            # First, try to get the "index" sitemap URL.
-            sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.index')
-        except urlresolvers.NoReverseMatch:
-            try:
-                # Next, try for the "global" sitemap URL.
-                sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap')
-            except urlresolvers.NoReverseMatch:
-                pass
-
-    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 = urlencode({'sitemap':url})
-    urlopen("%s?%s" % (ping_url, params))
-
-class Sitemap(object):
-    # This limit is defined by Google. See the index documentation at
-    # http://sitemaps.org/protocol.php#index.
-    limit = 50000
-
-    # If protocol is None, the URLs in the sitemap will use the protocol
-    # with which the sitemap was requested.
-    protocol = None
-
-    def __get(self, name, obj, default=None):
-        try:
-            attr = getattr(self, name)
-        except AttributeError:
-            return default
-        if callable(attr):
-            return attr(obj)
-        return attr
-
-    def items(self):
-        return []
-
-    def location(self, obj):
-        return obj.get_absolute_url()
-
-    def _get_paginator(self):
-        return paginator.Paginator(self.items(), self.limit)
-    paginator = property(_get_paginator)
-
-    def get_urls(self, page=1, site=None, protocol=None):
-        # Determine protocol
-        if self.protocol is not None:
-            protocol = self.protocol
-        if protocol is None:
-            protocol = 'http'
-
-        # Determine domain
-        if site is None:
-            if Site._meta.installed:
-                try:
-                    site = Site.objects.get_current()
-                except Site.DoesNotExist:
-                    pass
-            if site is None:
-                raise ImproperlyConfigured("To use sitemaps, either enable the sites framework or pass a Site/RequestSite object in your view.")
-        domain = site.domain
-
-        urls = []
-        for item in self.paginator.page(page).object_list:
-            loc = "%s://%s%s" % (protocol, domain, self.__get('location', item))
-            priority = self.__get('priority', item, None)
-            url_info = {
-                'item':       item,
-                'location':   loc,
-                'lastmod':    self.__get('lastmod', item, None),
-                'changefreq': self.__get('changefreq', item, None),
-                'priority':   str(priority if priority is not None else ''),
-            }
-            urls.append(url_info)
-        return urls
-
-class FlatPageSitemap(Sitemap):
-    def items(self):
-        current_site = Site.objects.get_current()
-        return current_site.flatpage_set.filter(registration_required=False)
-
-class GenericSitemap(Sitemap):
-    priority = None
-    changefreq = None
-
-    def __init__(self, info_dict, priority=None, changefreq=None):
-        self.queryset = info_dict['queryset']
-        self.date_field = info_dict.get('date_field', None)
-        self.priority = priority
-        self.changefreq = changefreq
-
-    def items(self):
-        # Make sure to return a clone; we don't want premature evaluation.
-        return self.queryset.filter()
-
-    def lastmod(self, item):
-        if self.date_field is not None:
-            return getattr(item, self.date_field)
-        return None
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/management/__init__.py b/lib/python2.7/site-packages/django/contrib/sitemaps/management/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/management/__init__.py
+++ /dev/null
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/__init__.py b/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/__init__.py
+++ /dev/null
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/ping_google.py b/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/ping_google.py
deleted file mode 100644
index 7fa1690..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/management/commands/ping_google.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.sitemaps import ping_google
-
-
-class Command(BaseCommand):
-    help = "Ping Google with an updated sitemap, pass optional url of sitemap"
-
-    def execute(self, *args, **options):
-        if len(args) == 1:
-            sitemap_url = args[0]
-        else:
-            sitemap_url = None
-        ping_google(sitemap_url=sitemap_url)
-
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/models.py b/lib/python2.7/site-packages/django/contrib/sitemaps/models.py
deleted file mode 100644
index 7ff128f..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap.xml b/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap.xml
deleted file mode 100644
index 30ca3c0..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% spaceless %}
-{% for url in urlset %}
-  <url>
-    <loc>{{ url.location }}</loc>
-    {% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %}
-    {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
-    {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
-   </url>
-{% endfor %}
-{% endspaceless %}
-</urlset>
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap_index.xml b/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap_index.xml
deleted file mode 100644
index f19e622..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/templates/sitemap_index.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for location in sitemaps %}<sitemap><loc>{{ location }}</loc></sitemap>{% endfor %}
-</sitemapindex>
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/__init__.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/__init__.py
+++ /dev/null
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/base.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/base.py
deleted file mode 100644
index 8e027d4..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/base.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from django.contrib.sites.models import Site
-from django.core.cache import cache
-from django.db import models
-from django.test import TestCase
-
-
-class TestModel(models.Model):
-    "A test model for "
-    name = models.CharField(max_length=100)
-
-    class Meta:
-        app_label = 'sitemaps'
-
-    def __unicode__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return '/testmodel/%s/' % self.id
-
-
-class SitemapTestsBase(TestCase):
-    protocol = 'http'
-    domain = 'example.com' if Site._meta.installed else 'testserver'
-    urls = 'django.contrib.sitemaps.tests.urls.http'
-
-    def setUp(self):
-        self.base_url = '%s://%s' % (self.protocol, self.domain)
-        self.old_Site_meta_installed = Site._meta.installed
-        cache.clear()
-        # Create an object for sitemap content.
-        TestModel.objects.create(name='Test Object')
-
-    def tearDown(self):
-        Site._meta.installed = self.old_Site_meta_installed
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap.xml b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap.xml
deleted file mode 100644
index 594aef1..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a customised template -->
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% spaceless %}
-{% for url in urlset %}
-  <url>
-    <loc>{{ url.location }}</loc>
-    {% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %}
-    {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
-    {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
-  </url>
-{% endfor %}
-{% endspaceless %}
-</urlset>
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap_index.xml b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap_index.xml
deleted file mode 100644
index 406c6b7..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/templates/custom_sitemap_index.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a customised template -->
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for location in sitemaps %}<sitemap><loc>{{ location }}</loc></sitemap>{% endfor %}
-</sitemapindex>
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_flatpages.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_flatpages.py
deleted file mode 100644
index 930f24f..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_flatpages.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.utils.unittest import skipUnless
-
-from .base import SitemapTestsBase
-
-class FlatpagesSitemapTests(SitemapTestsBase):
-
-    @skipUnless("django.contrib.flatpages" in settings.INSTALLED_APPS,
-                "django.contrib.flatpages app not installed.")
-    def test_flatpage_sitemap(self):
-        "Basic FlatPage sitemap test"
-
-        # Import FlatPage inside the test so that when django.contrib.flatpages
-        # is not installed we don't get problems trying to delete Site
-        # objects (FlatPage has an M2M to Site, Site.delete() tries to
-        # delete related objects, but the M2M table doesn't exist.
-        from django.contrib.flatpages.models import FlatPage
-
-        public = FlatPage.objects.create(
-            url='/public/',
-            title='Public Page',
-            enable_comments=True,
-            registration_required=False,
-        )
-        public.sites.add(settings.SITE_ID)
-        private = FlatPage.objects.create(
-            url='/private/',
-            title='Private Page',
-            enable_comments=True,
-            registration_required=True
-        )
-        private.sites.add(settings.SITE_ID)
-        response = self.client.get('/flatpages/sitemap.xml')
-        # Public flatpage should be in the sitemap
-        self.assertContains(response, '<loc>%s%s</loc>' % (self.base_url, public.url))
-        # Private flatpage should not be in the sitemap
-        self.assertNotContains(response, '<loc>%s%s</loc>' % (self.base_url, private.url))
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_generic.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_generic.py
deleted file mode 100644
index 5b26573..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_generic.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from __future__ import unicode_literals
-
-from django.test.utils import override_settings
-
-from .base import TestModel, SitemapTestsBase
-
-
-@override_settings(ABSOLUTE_URL_OVERRIDES={})
-class GenericViewsSitemapTests(SitemapTestsBase):
-
-    def test_generic_sitemap(self):
-        "A minimal generic sitemap can be rendered"
-        response = self.client.get('/generic/sitemap.xml')
-        expected = ''
-        for pk in TestModel.objects.values_list("id", flat=True):
-            expected += "<url><loc>%s/testmodel/%s/</loc></url>" % (self.base_url, pk)
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-%s
-</urlset>
-""" % expected
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_http.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_http.py
deleted file mode 100644
index a99025e..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_http.py
+++ /dev/null
@@ -1,153 +0,0 @@
-from __future__ import unicode_literals
-
-import os
-from datetime import date
-
-from django.conf import settings
-from django.contrib.sitemaps import Sitemap, GenericSitemap
-from django.contrib.sites.models import Site
-from django.core.exceptions import ImproperlyConfigured
-from django.test.utils import override_settings
-from django.utils.unittest import skipUnless
-from django.utils.formats import localize
-from django.utils._os import upath
-from django.utils.translation import activate, deactivate
-
-from .base import TestModel, SitemapTestsBase
-
-
-class HTTPSitemapTests(SitemapTestsBase):
-
-    def test_simple_sitemap_index(self):
-        "A simple sitemap index can be rendered"
-        response = self.client.get('/simple/index.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/simple/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    @override_settings(
-        TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'templates'),)
-    )
-    def test_simple_sitemap_custom_index(self):
-        "A simple sitemap index can be rendered with a custom template"
-        response = self.client.get('/simple/custom-index.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a customised template -->
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/simple/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-
-    def test_simple_sitemap_section(self):
-        "A simple sitemap section can be rendered"
-        response = self.client.get('/simple/sitemap-simple.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url, date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_simple_sitemap(self):
-        "A simple sitemap can be rendered"
-        response = self.client.get('/simple/sitemap.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url, date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    @override_settings(
-        TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'templates'),)
-    )
-    def test_simple_custom_sitemap(self):
-        "A simple sitemap can be rendered with a custom template"
-        response = self.client.get('/simple/custom-sitemap.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a customised template -->
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url, date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    @skipUnless(settings.USE_I18N, "Internationalization is not enabled")
-    @override_settings(USE_L10N=True)
-    def test_localized_priority(self):
-        "The priority value should not be localized (Refs #14164)"
-        activate('fr')
-        self.assertEqual('0,3', localize(0.3))
-
-        # Retrieve the sitemap. Check that priorities
-        # haven't been rendered in localized format
-        response = self.client.get('/simple/sitemap.xml')
-        self.assertContains(response, '<priority>0.5</priority>')
-        self.assertContains(response, '<lastmod>%s</lastmod>' % date.today())
-        deactivate()
-
-    def test_requestsite_sitemap(self):
-        # Make sure hitting the flatpages sitemap without the sites framework
-        # installed doesn't raise an exception
-        Site._meta.installed = False
-        response = self.client.get('/simple/sitemap.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>http://testserver/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % date.today()
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    @skipUnless("django.contrib.sites" in settings.INSTALLED_APPS,
-                "django.contrib.sites app not installed.")
-    def test_sitemap_get_urls_no_site_1(self):
-        """
-        Check we get ImproperlyConfigured if we don't pass a site object to
-        Sitemap.get_urls and no Site objects exist
-        """
-        Site.objects.all().delete()
-        self.assertRaises(ImproperlyConfigured, Sitemap().get_urls)
-
-    def test_sitemap_get_urls_no_site_2(self):
-        """
-        Check we get ImproperlyConfigured when we don't pass a site object to
-        Sitemap.get_urls if Site objects exists, but the sites framework is not
-        actually installed.
-        """
-        Site._meta.installed = False
-        self.assertRaises(ImproperlyConfigured, Sitemap().get_urls)
-
-    def test_sitemap_item(self):
-        """
-        Check to make sure that the raw item is included with each
-        Sitemap.get_url() url result.
-        """
-        test_sitemap = GenericSitemap({'queryset': TestModel.objects.all()})
-        def is_testmodel(url):
-            return isinstance(url['item'], TestModel)
-        item_in_url_info = all(map(is_testmodel, test_sitemap.get_urls()))
-        self.assertTrue(item_in_url_info)
-
-    def test_cached_sitemap_index(self):
-        """
-        Check that a cached sitemap index can be rendered (#2713).
-        """
-        response = self.client.get('/cached/index.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/cached/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_x_robots_sitemap(self):
-        response = self.client.get('/simple/index.xml')
-        self.assertEqual(response['X-Robots-Tag'], 'noindex, noodp, noarchive')
-
-        response = self.client.get('/simple/sitemap.xml')
-        self.assertEqual(response['X-Robots-Tag'], 'noindex, noodp, noarchive')
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_https.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_https.py
deleted file mode 100644
index baad02a..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/test_https.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from __future__ import unicode_literals
-
-from datetime import date
-
-from django.test.utils import override_settings
-
-from .base import SitemapTestsBase
-
-class HTTPSSitemapTests(SitemapTestsBase):
-    protocol = 'https'
-    urls = 'django.contrib.sitemaps.tests.urls.https'
-
-    def test_secure_sitemap_index(self):
-        "A secure sitemap index can be rendered"
-        response = self.client.get('/secure/index.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/secure/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_secure_sitemap_section(self):
-        "A secure sitemap section can be rendered"
-        response = self.client.get('/secure/sitemap-simple.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url, date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-
-@override_settings(SECURE_PROXY_SSL_HEADER=False)
-class HTTPSDetectionSitemapTests(SitemapTestsBase):
-    extra = {'wsgi.url_scheme': 'https'}
-
-    def test_sitemap_index_with_https_request(self):
-        "A sitemap index requested in HTTPS is rendered with HTTPS links"
-        response = self.client.get('/simple/index.xml', **self.extra)
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/simple/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url.replace('http://', 'https://')
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_sitemap_section_with_https_request(self):
-        "A sitemap section requested in HTTPS is rendered with HTTPS links"
-        response = self.client.get('/simple/sitemap-simple.xml', **self.extra)
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url.replace('http://', 'https://'), date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/__init__.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/__init__.py
+++ /dev/null
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/http.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/http.py
deleted file mode 100644
index a8b804f..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/http.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from datetime import datetime
-from django.conf.urls import patterns, url
-from django.contrib.sitemaps import Sitemap, GenericSitemap, FlatPageSitemap, views
-from django.views.decorators.cache import cache_page
-
-from django.contrib.sitemaps.tests.base import TestModel
-
-
-class SimpleSitemap(Sitemap):
-    changefreq = "never"
-    priority = 0.5
-    location = '/location/'
-    lastmod = datetime.now()
-
-    def items(self):
-        return [object()]
-
-simple_sitemaps = {
-    'simple': SimpleSitemap,
-}
-
-generic_sitemaps = {
-    'generic': GenericSitemap({'queryset': TestModel.objects.all()}),
-}
-
-flatpage_sitemaps = {
-    'flatpages': FlatPageSitemap,
-}
-
-urlpatterns = patterns('django.contrib.sitemaps.views',
-    (r'^simple/index\.xml$', 'index', {'sitemaps': simple_sitemaps}),
-    (r'^simple/custom-index\.xml$', 'index',
-        {'sitemaps': simple_sitemaps, 'template_name': 'custom_sitemap_index.xml'}),
-    (r'^simple/sitemap-(?P<section>.+)\.xml$', 'sitemap',
-        {'sitemaps': simple_sitemaps}),
-    (r'^simple/sitemap\.xml$', 'sitemap', {'sitemaps': simple_sitemaps}),
-    (r'^simple/custom-sitemap\.xml$', 'sitemap',
-        {'sitemaps': simple_sitemaps, 'template_name': 'custom_sitemap.xml'}),
-    (r'^generic/sitemap\.xml$', 'sitemap', {'sitemaps': generic_sitemaps}),
-    (r'^flatpages/sitemap\.xml$', 'sitemap', {'sitemaps': flatpage_sitemaps}),
-    url(r'^cached/index\.xml$', cache_page(1)(views.index),
-        {'sitemaps': simple_sitemaps, 'sitemap_url_name': 'cached_sitemap'}),
-    url(r'^cached/sitemap-(?P<section>.+)\.xml', cache_page(1)(views.sitemap),
-        {'sitemaps': simple_sitemaps}, name='cached_sitemap')
-)
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/https.py b/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/https.py
deleted file mode 100644
index a1b4b93..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/tests/urls/https.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.conf.urls import patterns
-
-from .http import SimpleSitemap
-
-class HTTPSSitemap(SimpleSitemap):
-    protocol = 'https'
-
-secure_sitemaps = {
-    'simple': HTTPSSitemap,
-}
-
-urlpatterns = patterns('django.contrib.sitemaps.views',
-    (r'^secure/index\.xml$', 'index', {'sitemaps': secure_sitemaps}),
-    (r'^secure/sitemap-(?P<section>.+)\.xml$', 'sitemap',
-        {'sitemaps': secure_sitemaps}),
-)
diff --git a/lib/python2.7/site-packages/django/contrib/sitemaps/views.py b/lib/python2.7/site-packages/django/contrib/sitemaps/views.py
deleted file mode 100644
index 95bc7ea..0000000
--- a/lib/python2.7/site-packages/django/contrib/sitemaps/views.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import warnings
-from functools import wraps
-
-from django.contrib.sites.models import get_current_site
-from django.core import urlresolvers
-from django.core.paginator import EmptyPage, PageNotAnInteger
-from django.http import Http404
-from django.template.response import TemplateResponse
-from django.utils import six
-
-def x_robots_tag(func):
-    @wraps(func)
-    def inner(request, *args, **kwargs):
-        response = func(request, *args, **kwargs)
-        response['X-Robots-Tag'] = 'noindex, noodp, noarchive'
-        return response
-    return inner
-
-@x_robots_tag
-def index(request, sitemaps,
-          template_name='sitemap_index.xml', content_type='application/xml',
-          sitemap_url_name='django.contrib.sitemaps.views.sitemap',
-          mimetype=None):
-
-    if mimetype:
-        warnings.warn("The mimetype keyword argument is deprecated, use "
-            "content_type instead", DeprecationWarning, stacklevel=2)
-        content_type = mimetype
-
-    req_protocol = 'https' if request.is_secure() else 'http'
-    req_site = get_current_site(request)
-
-    sites = []
-    for section, site in sitemaps.items():
-        if callable(site):
-            site = site()
-        protocol = req_protocol if site.protocol is None else site.protocol
-        sitemap_url = urlresolvers.reverse(
-                sitemap_url_name, kwargs={'section': section})
-        absolute_url = '%s://%s%s' % (protocol, req_site.domain, sitemap_url)
-        sites.append(absolute_url)
-        for page in range(2, site.paginator.num_pages + 1):
-            sites.append('%s?p=%s' % (absolute_url, page))
-
-    return TemplateResponse(request, template_name, {'sitemaps': sites},
-                            content_type=content_type)
-
-@x_robots_tag
-def sitemap(request, sitemaps, section=None,
-            template_name='sitemap.xml', content_type='application/xml',
-            mimetype=None):
-
-    if mimetype:
-        warnings.warn("The mimetype keyword argument is deprecated, use "
-            "content_type instead", DeprecationWarning, stacklevel=2)
-        content_type = mimetype
-
-    req_protocol = 'https' if request.is_secure() else 'http'
-    req_site = get_current_site(request)
-
-    if section is not None:
-        if section not in sitemaps:
-            raise Http404("No sitemap available for section: %r" % section)
-        maps = [sitemaps[section]]
-    else:
-        maps = list(six.itervalues(sitemaps))
-    page = request.GET.get("p", 1)
-
-    urls = []
-    for site in maps:
-        try:
-            if callable(site):
-                site = site()
-            urls.extend(site.get_urls(page=page, site=req_site,
-                                      protocol=req_protocol))
-        except EmptyPage:
-            raise Http404("Page %s empty" % page)
-        except PageNotAnInteger:
-            raise Http404("No page '%s'" % page)
-    return TemplateResponse(request, template_name, {'urlset': urls},
-                            content_type=content_type)