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

Advanced deprecation warnings for Django 1.7.

parent 8b9b8d3b

django/conf/urls/shortcut.py

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import warnings 
from django.conf.urls import patterns



warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.",

    PendingDeprecationWarning)

    DeprecationWarning)



urlpatterns = patterns('django.views',

    (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ csrf_protect_m = method_decorator(csrf_protect) 


class RenameBaseModelAdminMethods(forms.MediaDefiningClass, RenameMethodsBase):

    renamed_methods = (

        ('queryset', 'get_queryset', PendingDeprecationWarning),

        ('queryset', 'get_queryset', DeprecationWarning),

    )

django/contrib/admin/views/main.py

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ def _is_changelist_popup(request): 
        warnings.warn(

        "The `%s` GET parameter has been renamed to `%s`." %

        (IS_LEGACY_POPUP_VAR, IS_POPUP_VAR),

        PendingDeprecationWarning, 2)

        DeprecationWarning, 2)

        return True



    return False
@@ -60,7 +60,7 @@ def _is_changelist_popup(request): 


class RenameChangeListMethods(RenameMethodsBase):

    renamed_methods = (

        ('get_query_set', 'get_queryset', PendingDeprecationWarning),

        ('get_query_set', 'get_queryset', DeprecationWarning),

    )
@@ -115,14 +115,14 @@ class ChangeList(six.with_metaclass(RenameChangeListMethods)): 
    def root_query_set(self):

        warnings.warn("`ChangeList.root_query_set` is deprecated, "

                      "use `root_queryset` instead.",

                      PendingDeprecationWarning, 2)

                      DeprecationWarning, 2)

        return self.root_queryset



    @property

    def query_set(self):

        warnings.warn("`ChangeList.query_set` is deprecated, "

                      "use `queryset` instead.",

                      PendingDeprecationWarning, 2)

                      DeprecationWarning, 2)

        return self.queryset



    def get_filters_params(self, params=None):

django/contrib/comments/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from django.contrib.comments.models import Comment 
from django.contrib.comments.forms import CommentForm

from django.utils.importlib import import_module



warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", PendingDeprecationWarning)

warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", DeprecationWarning)



DEFAULT_COMMENTS_APP = 'django.contrib.comments'

django/contrib/comments/templatetags/comments.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ register = template.Library() 


class RenameBaseCommentNodeMethods(RenameMethodsBase):

    renamed_methods = (

        ('get_query_set', 'get_queryset', PendingDeprecationWarning),

        ('get_query_set', 'get_queryset', DeprecationWarning),

    )