Permalink
Browse files

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

  • Loading branch information...
1 parent d1d514a commit 62c3f6362ad46946ec9cc37554026897f1ea9452 @ramiro ramiro committed Aug 16, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 django/utils/text.py
View
9 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
-# people rely on it being here.
-from django.utils.encoding import force_text, force_unicode
+from django.utils.encoding import force_text
+if not six.PY3:
+ # 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

0 comments on commit 62c3f63

Please sign in to comment.