diff options
| author | Tom Christie | 2014-10-01 13:09:14 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-10-01 13:09:14 +0100 |
| commit | 381771731f48c75e7d5951e353049cceec386512 (patch) | |
| tree | bc426b11d4ba33cbbb2063e3393f8855c7841fd8 /rest_framework/generics.py | |
| parent | bb2222963f527638ed2bc9a817415102312e12e0 (diff) | |
| download | django-rest-framework-381771731f48c75e7d5951e353049cceec386512.tar.bz2 | |
Use six.text_type instead of str everywhere
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cf903dab..3d6cf168 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -3,10 +3,11 @@ Generic views that provide commonly needed behaviour. """ from __future__ import unicode_literals -from django.db.models.query import QuerySet from django.core.paginator import Paginator, InvalidPage +from django.db.models.query import QuerySet from django.http import Http404 from django.shortcuts import get_object_or_404 as _get_object_or_404 +from django.utils import six from django.utils.translation import ugettext as _ from rest_framework import views, mixins from rest_framework.settings import api_settings @@ -127,7 +128,7 @@ class GenericAPIView(views.APIView): error_format = _('Invalid page (%(page_number)s): %(message)s') raise Http404(error_format % { 'page_number': page_number, - 'message': str(exc) + 'message': six.text_type(exc) }) return page |
