[py3] Replaced unicode/str by six.text_type/bytes.

1 files changed, 2 insertions, 1 deletions

diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index bbe4b052b7..0e28a55c3a 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -11,6 +11,7 @@ from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.utils.datastructures import MultiValueDict
 from django.utils.encoding import force_unicode
+from django.utils import six
 from django.utils.text import unescape_entities
 from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers
 
@@ -77,7 +78,7 @@ class MultiPartParser(object):
             # This means we shouldn't continue...raise an error.
             raise MultiPartParserError("Invalid content length: %r" % content_length)
 
-        if isinstance(boundary, unicode):
+        if isinstance(boundary, six.text_type):
             boundary = boundary.encode('ascii')
         self._boundary = boundary
         self._input_data = input_data