diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-23 10:23:23 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-23 10:24:50 +0200 |
| commit | 03671ad7e30749ecde70a7af04fff0b57476b1e0 (patch) | |
| tree | 4947a5964148d9b501193431ed61bcd9959f1fc2 | |
| parent | 5301a9d7b1c2151e9b0496c7e244e8ceb6d273c1 (diff) | |
Reordered imports
to avoid an error introduced in 5301a9d7b1.
| -rw-r--r-- | django/utils/text.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/django/utils/text.py b/django/utils/text.py index e7c62131a0..c19708458b 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -7,16 +7,17 @@ from gzip import GzipFile from io import BytesIO 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.six.moves import html_entities from django.utils.translation import ugettext_lazy, ugettext as _, pgettext from django.utils.safestring import mark_safe +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 + # Capitalizes the first letter of a string. capfirst = lambda x: x and force_text(x)[0].upper() + force_text(x)[1:] capfirst = allow_lazy(capfirst, six.text_type) |
