Commit 232181d1 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Advanced deprecation warnings for 1.8.

parent 74b34676

django/test/utils.py

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from django.template import Template, loader, TemplateDoesNotExist 
from django.template.loaders import cached

from django.test.signals import template_rendered, setting_changed

from django.utils import six

from django.utils.deprecation import RemovedInDjango18Warning, RemovedInDjango19Warning

from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning

from django.utils.encoding import force_str

from django.utils.translation import deactivate
@@ -458,7 +458,7 @@ class CaptureQueriesContext(object): 




class IgnoreDeprecationWarningsMixin(object):

    warning_classes = [RemovedInDjango18Warning]

    warning_classes = [RemovedInDjango19Warning]



    def setUp(self):

        super(IgnoreDeprecationWarningsMixin, self).setUp()
@@ -473,11 +473,11 @@ class IgnoreDeprecationWarningsMixin(object): 




class IgnorePendingDeprecationWarningsMixin(IgnoreDeprecationWarningsMixin):

        warning_classes = [RemovedInDjango19Warning]

        warning_classes = [RemovedInDjango20Warning]





class IgnoreAllDeprecationWarningsMixin(IgnoreDeprecationWarningsMixin):

        warning_classes = [RemovedInDjango19Warning, RemovedInDjango18Warning]

        warning_classes = [RemovedInDjango20Warning, RemovedInDjango19Warning]





@contextmanager

django/utils/deprecation.py

+3 −3
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ import inspect 
import warnings





class RemovedInDjango19Warning(PendingDeprecationWarning):

class RemovedInDjango20Warning(DeprecationWarning):

    pass





class RemovedInDjango18Warning(DeprecationWarning):

class RemovedInDjango19Warning(PendingDeprecationWarning):

    pass





RemovedInNextVersionWarning = RemovedInDjango18Warning

RemovedInNextVersionWarning = RemovedInDjango19Warning





class warn_about_renamed_method(object):

tests/cache/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ from django.middleware.cache import (FetchFromCacheMiddleware, 
from django.template import Template

from django.template.response import TemplateResponse

from django.test import TestCase, TransactionTestCase, RequestFactory, override_settings

from django.test.utils import IgnorePendingDeprecationWarningsMixin

from django.test.utils import IgnoreDeprecationWarningsMixin

from django.utils import six

from django.utils import timezone

from django.utils import translation
@@ -1176,7 +1176,7 @@ class CustomCacheKeyValidationTests(TestCase): 
        }

    }

)

class GetCacheTests(IgnorePendingDeprecationWarningsMixin, TestCase):

class GetCacheTests(IgnoreDeprecationWarningsMixin, TestCase):



    def test_simple(self):

        from django.core.cache import caches, get_cache

tests/generic_inline_admin/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ from django.contrib.contenttypes.forms import generic_inlineformset_factory 
from django.forms.formsets import DEFAULT_MAX_NUM

from django.forms.models import ModelForm

from django.test import TestCase, override_settings

from django.utils.deprecation import RemovedInDjango19Warning



# local test models

from .admin import MediaInline, MediaPermanentInline
@@ -376,7 +377,7 @@ class GenericInlineModelAdminTest(TestCase): 
            # Verify that the deprecation warning was triggered when get_formsets was called

            # This verifies that we called that method.

            self.assertEqual(len(w), 1)

            self.assertTrue(issubclass(w[0].category, PendingDeprecationWarning))

            self.assertTrue(issubclass(w[0].category, RemovedInDjango19Warning))



        class EpisodeAdmin(admin.ModelAdmin):

            inlines = [

tests/queries/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ from django.db.models.sql.where import WhereNode, EverythingNode, NothingNode 
from django.db.models.sql.datastructures import EmptyResultSet

from django.test import TestCase, skipUnlessDBFeature

from django.test.utils import str_prefix, CaptureQueriesContext

from django.utils.deprecation import RemovedInDjango19Warning

from django.utils import six



from .models import (
@@ -1149,7 +1150,7 @@ class Queries1Tests(BaseQuerysetTest): 
                ['<Tag: t1>', '<Tag: t2>', '<Tag: t3>', '<Tag: t4>', '<Tag: t5>']

            )

            self.assertEqual(len(w), 1)

            self.assertTrue(issubclass(w[0].category, PendingDeprecationWarning))

            self.assertTrue(issubclass(w[0].category, RemovedInDjango19Warning))





class Queries2Tests(TestCase):