summaryrefslogtreecommitdiff
path: root/django/http/request.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/http/request.py')
-rw-r--r--django/http/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/http/request.py b/django/http/request.py
index b4053142ac..fe1684ee58 100644
--- a/django/http/request.py
+++ b/django/http/request.py
@@ -522,7 +522,7 @@ def bytes_to_text(s, encoding):
Returns any non-basestring objects without change.
"""
if isinstance(s, bytes):
- return six.text_type(s, encoding, 'replace')
+ return str(s, encoding, 'replace')
else:
return s