diff options
| author | Tom Christie | 2013-06-27 20:36:14 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-06-27 20:36:14 +0100 | 
| commit | 379ad8a82485e61b180ee823ba49799d39446aeb (patch) | |
| tree | 0fe9a5b352c94d6963c30bfab4959a3579b95f56 /rest_framework/mixins.py | |
| parent | 3fcc01273c5efef26d911e50c02a4a43f89b34eb (diff) | |
| download | django-rest-framework-379ad8a82485e61b180ee823ba49799d39446aeb.tar.bz2 | |
pending deprecations -> deprecated
Diffstat (limited to 'rest_framework/mixins.py')
| -rw-r--r-- | rest_framework/mixins.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index f11def6d..679dfa6c 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -24,14 +24,14 @@ def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None)      include = []      if pk: -        # Pending deprecation +        # Deprecated          pk_field = obj._meta.pk          while pk_field.rel:              pk_field = pk_field.rel.to._meta.pk          include.append(pk_field.name)      if slug_field: -        # Pending deprecation +        # Deprecated          include.append(slug_field)      if lookup_field and lookup_field != 'pk': @@ -77,10 +77,10 @@ class ListModelMixin(object):          # `.allow_empty = False`, to raise 404 errors on empty querysets.          if not self.allow_empty and not self.object_list:              warnings.warn( -                'The `allow_empty` parameter is due to be deprecated. ' +                'The `allow_empty` parameter is deprecated. '                  'To use `allow_empty=False` style behavior, You should override '                  '`get_queryset()` and explicitly raise a 404 on empty querysets.', -                PendingDeprecationWarning +                DeprecationWarning              )              class_name = self.__class__.__name__              error_msg = self.empty_error % {'class_name': class_name} | 
