diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 25150d525..32a24445f 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -9,7 +9,7 @@ import binascii from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware from django.utils.six import text_type -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions diff --git a/rest_framework/authtoken/apps.py b/rest_framework/authtoken/apps.py index ad01cb404..f90fe961e 100644 --- a/rest_framework/authtoken/apps.py +++ b/rest_framework/authtoken/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class AuthTokenConfig(AppConfig): diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index e5f46dd66..bb552f3e5 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -1,5 +1,5 @@ from django.contrib.auth import authenticate -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework import serializers diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index f79b16129..d6e76b4d2 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -11,7 +11,7 @@ import math from django.http import JsonResponse from django.utils import six from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.translation import ungettext from rest_framework import status diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c8f65db0e..5aeaad7b8 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -27,7 +27,7 @@ from django.utils.formats import localize_input, sanitize_separators from django.utils.functional import lazy from django.utils.ipv6 import clean_ipv6_address from django.utils.timezone import utc -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pytz.exceptions import InvalidTimeError from rest_framework import ISO_8601 diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index b11d7cdf3..afa417a63 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -14,7 +14,7 @@ from django.template import loader from django.utils import six from django.utils.encoding import force_text from django.utils.six.moves.urllib import parse as urlparse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework.compat import coreapi, coreschema from rest_framework.exceptions import NotFound diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 31c1e7561..4d18610e7 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -13,7 +13,7 @@ from django.utils.encoding import ( python_2_unicode_compatible, smart_text, uri_to_iri ) from django.utils.six.moves.urllib import parse as urlparse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework.fields import ( Field, empty, get_attribute, is_simple_callable, iter_options diff --git a/rest_framework/schemas/inspectors.py b/rest_framework/schemas/inspectors.py index 85142edce..ef5e19288 100644 --- a/rest_framework/schemas/inspectors.py +++ b/rest_framework/schemas/inspectors.py @@ -12,7 +12,7 @@ from weakref import WeakKeyDictionary from django.db import models from django.utils.encoding import force_text, smart_text from django.utils.six.moves.urllib import parse as urlparse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework import exceptions, serializers from rest_framework.compat import coreapi, coreschema, uritemplate diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9830edb3f..054dc09a6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -25,7 +25,7 @@ from django.db.models.fields import Field as DjangoModelField from django.db.models.fields import FieldDoesNotExist from django.utils import six, timezone from django.utils.functional import cached_property -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework.compat import Mapping, postgres_fields, unicode_to_repr from rest_framework.exceptions import ErrorDetail, ValidationError diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 2ea3e5ac1..b42165a1c 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -9,7 +9,7 @@ object creation, and makes it possible to switch between using the implicit from __future__ import unicode_literals from django.db import DataError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework.compat import unicode_to_repr from rest_framework.exceptions import ValidationError diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 206ff6c2e..1dfea4b14 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from rest_framework import exceptions from rest_framework.compat import unicode_http_header