summaryrefslogtreecommitdiff
path: root/django/utils/text.py
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2012-08-15 16:59:09 -0500
committerAdrian Holovaty <adrian@holovaty.com>2012-08-15 16:59:31 -0500
commitfd04e711d2a5440d7a828644ee65b88bf00c83b5 (patch)
tree55ab69c32b2a32ed9605bf14d8c9355c9a34a71e /django/utils/text.py
parent27d16a3ca4a330f5aa46015ccd7d5a9ee72873b6 (diff)
downloaddjango-fd04e711d2a5440d7a828644ee65b88bf00c83b5.tar.gz
Added import of force_unicode to utils/text.py
For backwards compatibility with stupid people like me. Refs #18772.
Diffstat (limited to 'django/utils/text.py')
-rw-r--r--django/utils/text.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/text.py b/django/utils/text.py
index d7f3a03174..10a071510f 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -7,7 +7,9 @@ from gzip import GzipFile
from django.utils.six.moves import html_entities
from io import BytesIO
-from django.utils.encoding import force_text
+# 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.functional import allow_lazy, SimpleLazyObject
from django.utils import six
from django.utils.translation import ugettext_lazy, ugettext as _, pgettext