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

Advanced pending deprecation warnings. 

Also added stacklevel argument, fixed #18127.
parent 13082933

django/bin/daily_cleanup.py

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ if __name__ == "__main__": 
    warnings.warn(

        "The `daily_cleanup` script has been deprecated "

        "in favor of `django-admin.py clearsessions`.",

        PendingDeprecationWarning)

        DeprecationWarning)

    management.call_command('clearsessions')

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ class Settings(BaseSettings): 
                        isinstance(setting_value, six.string_types):

                    warnings.warn("The %s setting must be a tuple. Please fix your "

                                  "settings, as auto-correction is now deprecated." % setting,

                        PendingDeprecationWarning)

                                  DeprecationWarning, stacklevel=2)

                    setting_value = (setting_value,) # In case the user forgot the comma.

                setattr(self, setting, setting_value)

django/contrib/auth/models.py

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin): 
        SiteProfileNotAvailable if this site does not allow profiles.

        """

        warnings.warn("The use of AUTH_PROFILE_MODULE to define user profiles has been deprecated.",

            PendingDeprecationWarning)

            DeprecationWarning, stacklevel=2)

        if not hasattr(self, '_profile_cache'):

            from django.conf import settings

            if not getattr(settings, 'AUTH_PROFILE_MODULE', False):

django/core/management/commands/cleanup.py

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ class Command(clearsessions.Command): 
    def handle_noargs(self, **options):

        warnings.warn(

            "The `cleanup` command has been deprecated in favor of `clearsessions`.",

            PendingDeprecationWarning)

            DeprecationWarning)

        super(Command, self).handle_noargs(**options)

django/db/models/query.py

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ class QuerySet(object): 
        """

        if 'depth' in kwargs:

            warnings.warn('The "depth" keyword argument has been deprecated.\n'

                    'Use related field names instead.', PendingDeprecationWarning)

                    'Use related field names instead.', DeprecationWarning, stacklevel=2)

        depth = kwargs.pop('depth', 0)

        if kwargs:

            raise TypeError('Unexpected keyword arguments to select_related: %s'