Commit 4445d36d authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #22384 -- Deprecated reversing URLs by dotted path.

parent e0208944

django/contrib/flatpages/urls.py

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ from django.conf.urls import url 
from django.contrib.flatpages import views



urlpatterns = [

    url(r'^(?P<url>.*)$', views.flatpage),

    url(r'^(?P<url>.*)$', views.flatpage, name='django.contrib.flatpages.views.flatpage'),

]

django/contrib/messages/tests/base.py

+11 −16
Original line number Diff line number Diff line
@@ -158,10 +158,9 @@ class BaseTests(object): 
        data = {

            'messages': ['Test message %d' % x for x in range(5)],

        }

        show_url = reverse('django.contrib.messages.tests.urls.show')

        show_url = reverse('show_message')

        for level in ('debug', 'info', 'success', 'warning', 'error'):

            add_url = reverse('django.contrib.messages.tests.urls.add',

                              args=(level,))

            add_url = reverse('add_message', args=(level,))

            response = self.client.post(add_url, data, follow=True)

            self.assertRedirects(response, show_url)

            self.assertTrue('messages' in response.context)
@@ -175,10 +174,9 @@ class BaseTests(object): 
        data = {

            'messages': ['Test message %d' % x for x in range(5)],

        }

        show_url = reverse('django.contrib.messages.tests.urls.show_template_response')

        show_url = reverse('show_template_response')

        for level in self.levels.keys():

            add_url = reverse('django.contrib.messages.tests.urls.add_template_response',

                              args=(level,))

            add_url = reverse('add_template_response', args=(level,))

            response = self.client.post(add_url, data, follow=True)

            self.assertRedirects(response, show_url)

            self.assertTrue('messages' in response.context)
@@ -191,7 +189,7 @@ class BaseTests(object): 
                self.assertNotContains(response, msg)



    def test_context_processor_message_levels(self):

        show_url = reverse('django.contrib.messages.tests.urls.show_template_response')

        show_url = reverse('show_template_response')

        response = self.client.get(show_url)



        self.assertTrue('DEFAULT_MESSAGE_LEVELS' in response.context)
@@ -206,12 +204,11 @@ class BaseTests(object): 
        data = {

            'messages': ['Test message %d' % x for x in range(5)],

        }

        show_url = reverse('django.contrib.messages.tests.urls.show')

        show_url = reverse('show_message')

        messages = []

        for level in ('debug', 'info', 'success', 'warning', 'error'):

            messages.extend([Message(self.levels[level], msg) for msg in data['messages']])

            add_url = reverse('django.contrib.messages.tests.urls.add',

                              args=(level,))

            add_url = reverse('add_message', args=(level,))

            self.client.post(add_url, data)

        response = self.client.get(show_url)

        self.assertTrue('messages' in response.context)
@@ -233,10 +230,9 @@ class BaseTests(object): 
        data = {

            'messages': ['Test message %d' % x for x in range(5)],

        }

        reverse('django.contrib.messages.tests.urls.show')

        reverse('show_message')

        for level in ('debug', 'info', 'success', 'warning', 'error'):

            add_url = reverse('django.contrib.messages.tests.urls.add',

                              args=(level,))

            add_url = reverse('add_message', args=(level,))

            self.assertRaises(MessageFailure, self.client.post, add_url,

                              data, follow=True)
@@ -254,10 +250,9 @@ class BaseTests(object): 
            'messages': ['Test message %d' % x for x in range(5)],

            'fail_silently': True,

        }

        show_url = reverse('django.contrib.messages.tests.urls.show')

        show_url = reverse('show_message')

        for level in ('debug', 'info', 'success', 'warning', 'error'):

            add_url = reverse('django.contrib.messages.tests.urls.add',

                              args=(level,))

            add_url = reverse('add_message', args=(level,))

            response = self.client.post(add_url, data, follow=True)

            self.assertRedirects(response, show_url)

            self.assertFalse('messages' in response.context)

django/contrib/messages/tests/urls.py

+6 −6
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ def add(request, message_type): 
        else:

            getattr(messages, message_type)(request, msg)



    show_url = reverse('django.contrib.messages.tests.urls.show')

    show_url = reverse('show_message')

    return HttpResponseRedirect(show_url)
@@ -42,7 +42,7 @@ def add_template_response(request, message_type): 
    for msg in request.POST.getlist('messages'):

        getattr(messages, message_type)(request, msg)



    show_url = reverse('django.contrib.messages.tests.urls.show_template_response')

    show_url = reverse('show_template_response')

    return HttpResponseRedirect(show_url)
@@ -69,9 +69,9 @@ class ContactFormViewWithMsg(SuccessMessageMixin, FormView): 




urlpatterns = [

    url('^add/(debug|info|success|warning|error)/$', add),

    url('^add/(debug|info|success|warning|error)/$', add, name='add_message'),

    url('^add/msg/$', ContactFormViewWithMsg.as_view(), name='add_success_msg'),

    url('^show/$', show),

    url('^template_response/add/(debug|info|success|warning|error)/$', add_template_response),

    url('^template_response/show/$', show_template_response),

    url('^show/$', show, name='show_message'),

    url('^template_response/add/(debug|info|success|warning|error)/$', add_template_response, name='add_template_response'),

    url('^template_response/show/$', show_template_response, name='show_template_response'),

]

django/contrib/sitemaps/tests/test_https.py

+11 −1
Original line number Diff line number Diff line 
from __future__ import unicode_literals



from datetime import date

import warnings



from django.test import override_settings

from django.utils.deprecation import RemovedInDjango20Warning



from .base import SitemapTestsBase
@@ -38,6 +40,14 @@ class HTTPSDetectionSitemapTests(SitemapTestsBase): 


    def test_sitemap_index_with_https_request(self):

        "A sitemap index requested in HTTPS is rendered with HTTPS links"

        with warnings.catch_warnings():

            warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)

            # The URL for views.sitemap in tests/urls/http.py has been updated

            # with a name but since reversing by Python path is tried first

            # before reversing by name and works since we're giving

            # name='django.contrib.sitemaps.views.sitemap', we need to silence

            # the erroneous warning until reversing by dotted path is removed.

            # The test will work without modification when it's removed.

            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">

django/contrib/sitemaps/tests/urls/http.py

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ urlpatterns = [ 
    url(r'^simple/custom-index\.xml$', views.index,

        {'sitemaps': simple_sitemaps, 'template_name': 'custom_sitemap_index.xml'}),

    url(r'^simple/sitemap-(?P<section>.+)\.xml$', views.sitemap,

        {'sitemaps': simple_sitemaps}),

        {'sitemaps': simple_sitemaps}, name='django.contrib.sitemaps.views.sitemap'),

    url(r'^simple/sitemap\.xml$', views.sitemap, {'sitemaps': simple_sitemaps}),

    url(r'^simple/custom-sitemap\.xml$', views.sitemap,

        {'sitemaps': simple_sitemaps, 'template_name': 'custom_sitemap.xml'}),