p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Ramiro Morales 2012-08-15 23:08:16 -03:00
parent d1d514af04
commit 62c3f6362a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/utils/text.py
View File

@ -1,15 +1,18 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
from django.utils import six
import unicodedata import unicodedata
import warnings import warnings
from gzip import GzipFile from gzip import GzipFile
from django.utils.six.moves import html_entities from django.utils.six.moves import html_entities
from io import BytesIO 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.functional import allow_lazy, SimpleLazyObject
from django.utils import six from django.utils import six
from django.utils.translation import ugettext_lazy, ugettext as _, pgettext from django.utils.translation import ugettext_lazy, ugettext as _, pgettext