Merge master

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 2c97f1d7..0bd24939 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -4,8 +4,8 @@ Helper classes for parsers.
 from __future__ import unicode_literals
 from django.db.models.query import QuerySet
 from django.utils import six, timezone
+from django.utils.encoding import force_text
 from django.utils.functional import Promise
-from rest_framework.compat import force_text
 import datetime
 import decimal
 import json