From 03671ad7e30749ecde70a7af04fff0b57476b1e0 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 23 Aug 2012 10:23:23 +0200 Subject: [PATCH] Reordered imports to avoid an error introduced in 5301a9d7b1. --- django/utils/text.py | 9 +++++---- 1 file 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)