Commit e84f79f0 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #18042 -- Advanced deprecation warnings. 

Thanks Ramiro for the patch.
parent 227cec68

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ def compat_patch_logging_config(logging_config): 
            "handler: adding implicit debug-false-only filter. "

            "See http://docs.djangoproject.com/en/dev/releases/1.4/"

            "#request-exceptions-are-now-always-logged",

            PendingDeprecationWarning)

            DeprecationWarning)



        filter_name = "require_debug_false"

django/conf/urls/defaults.py

+1 −1
Original line number Diff line number Diff line 
import warnings

warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead",

              PendingDeprecationWarning)

              DeprecationWarning)



from django.conf.urls import (handler403, handler404, handler500,

        include, patterns, url)

django/contrib/admin/templatetags/adminmedia.py

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ def admin_media_prefix(): 
    """

    warnings.warn(

        "The admin_media_prefix template tag is deprecated. "

        "Use the static template tag instead.", PendingDeprecationWarning)

        "Use the static template tag instead.", DeprecationWarning)

    return PrefixNode.handle_simple("ADMIN_MEDIA_PREFIX")

django/contrib/databrowse/__init__.py

+1 −2
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ import warnings 
from django.contrib.databrowse.sites import DatabrowsePlugin, ModelDatabrowse, DatabrowseSite, site





warnings.warn("The Databrowse contrib app is deprecated",

    PendingDeprecationWarning)
 
warnings.warn("The Databrowse contrib app is deprecated", DeprecationWarning)

django/contrib/formtools/tests/__init__.py

+9 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ from django.conf import settings 
from django.contrib.formtools import preview, utils

from django.contrib.formtools.wizard import FormWizard

from django.test import TestCase

from django.test.utils import get_warnings_state, restore_warnings_state

from django.test.utils import override_settings

from django.utils import unittest
@@ -40,12 +41,20 @@ class PreviewTests(TestCase): 


    def setUp(self):

        super(PreviewTests, self).setUp()

        self.save_warnings_state()

        warnings.filterwarnings('ignore', category=DeprecationWarning,

                                module='django.contrib.formtools.wizard.legacy')



        # Create a FormPreview instance to share between tests

        self.preview = preview.FormPreview(TestForm)

        input_template = '<input type="hidden" name="%s" value="%s" />'

        self.input = input_template % (self.preview.unused_name('stage'), "%d")

        self.test_data = {'field1':u'foo', 'field1_':u'asdf'}



    def tearDown(self):

        super(PreviewTests, self).tearDown()

        self.restore_warnings_state()



    def test_unused_name(self):

        """

        Verifies name mangling to get uniue field name.