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/generics.py | |
| parent | 3fcc01273c5efef26d911e50c02a4a43f89b34eb (diff) | |
| download | django-rest-framework-379ad8a82485e61b180ee823ba49799d39446aeb.tar.bz2 | |
pending deprecations -> deprecated
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 32 | 
1 files changed, 16 insertions, 16 deletions
| diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 99e9782e..874a142c 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -108,11 +108,11 @@ class GenericAPIView(views.APIView):          deprecated_style = False          if page_size is not None:              warnings.warn('The `page_size` parameter to `paginate_queryset()` ' -                          'is due to be deprecated. ' +                          'is deprecated. '                            'Note that the return style of this method is also '                            'changed, and will simply return a page object '                            'when called without a `page_size` argument.', -                          PendingDeprecationWarning, stacklevel=2) +                          DeprecationWarning, stacklevel=2)              deprecated_style = True          else:              # Determine the required page size. @@ -123,10 +123,10 @@ class GenericAPIView(views.APIView):          if not self.allow_empty:              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, stacklevel=2 +                DeprecationWarning, stacklevel=2              )          paginator = self.paginator_class(queryset, page_size, @@ -166,10 +166,10 @@ class GenericAPIView(views.APIView):          if not filter_backends and self.filter_backend:              warnings.warn(                  'The `filter_backend` attribute and `FILTER_BACKEND` setting ' -                'are due to be deprecated in favor of a `filter_backends` ' +                'are deprecated in favor of a `filter_backends` '                  'attribute and `DEFAULT_FILTER_BACKENDS` setting, that take '                  'a *list* of filter backend classes.', -                PendingDeprecationWarning, stacklevel=2 +                DeprecationWarning, stacklevel=2              )              filter_backends = [self.filter_backend] @@ -192,8 +192,8 @@ class GenericAPIView(views.APIView):          """          if queryset is not None:              warnings.warn('The `queryset` parameter to `get_paginate_by()` ' -                          'is due to be deprecated.', -                          PendingDeprecationWarning, stacklevel=2) +                          'is deprecated.', +                          DeprecationWarning, stacklevel=2)          if self.paginate_by_param:              query_params = self.request.QUERY_PARAMS @@ -272,16 +272,16 @@ class GenericAPIView(views.APIView):              filter_kwargs = {self.lookup_field: lookup}          elif pk is not None and self.lookup_field == 'pk':              warnings.warn( -                'The `pk_url_kwarg` attribute is due to be deprecated. ' +                'The `pk_url_kwarg` attribute is deprecated. '                  'Use the `lookup_field` attribute instead', -                PendingDeprecationWarning +                DeprecationWarning              )              filter_kwargs = {'pk': pk}          elif slug is not None and self.lookup_field == 'pk':              warnings.warn( -                'The `slug_url_kwarg` attribute is due to be deprecated. ' +                'The `slug_url_kwarg` attribute is deprecated. '                  'Use the `lookup_field` attribute instead', -                PendingDeprecationWarning +                DeprecationWarning              )              filter_kwargs = {self.slug_field: slug}          else: @@ -482,9 +482,9 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,  class MultipleObjectAPIView(GenericAPIView):      def __init__(self, *args, **kwargs):          warnings.warn( -            'Subclassing `MultipleObjectAPIView` is due to be deprecated. ' +            'Subclassing `MultipleObjectAPIView` is deprecated. '              'You should simply subclass `GenericAPIView` instead.', -            PendingDeprecationWarning, stacklevel=2 +            DeprecationWarning, stacklevel=2          )          super(MultipleObjectAPIView, self).__init__(*args, **kwargs) @@ -492,8 +492,8 @@ class MultipleObjectAPIView(GenericAPIView):  class SingleObjectAPIView(GenericAPIView):      def __init__(self, *args, **kwargs):          warnings.warn( -            'Subclassing `SingleObjectAPIView` is due to be deprecated. ' +            'Subclassing `SingleObjectAPIView` is deprecated. '              'You should simply subclass `GenericAPIView` instead.', -            PendingDeprecationWarning, stacklevel=2 +            DeprecationWarning, stacklevel=2          )          super(SingleObjectAPIView, self).__init__(*args, **kwargs) | 
