Fix changes introduced in fd04e7 so they don't break on Python 3.

django/utils/text.py

@@ -1,15 +1,18 @@
 from __future__ import unicode_literals
 
 import re
+from django.utils import six
 import unicodedata
 import warnings
 from gzip import GzipFile
 from django.utils.six.moves import html_entities
 from io import BytesIO
 
-# Import force_unicode even though this module doesn't use it, because some
+from django.utils.encoding import force_text
-# people rely on it being here.
+if not six.PY3:
-from django.utils.encoding import force_text, force_unicode
+    # Import force_unicode even though this module doesn't use it, because some
+    # people rely on it being here.
+    from django.utils.encoding import force_unicode
 from django.utils.functional import allow_lazy, SimpleLazyObject
 from django.utils import six
 from django.utils.translation import ugettext_lazy, ugettext as _, pgettext