diff --git a/django/utils/encoding.py b/django/utils/encoding.py index bf59f44e31..4774fb0d26 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -6,6 +6,10 @@ def smart_unicode(s): # The input is the result of a gettext_lazy() call, or similar. It will # already be encoded in DEFAULT_CHARSET on evaluation and we don't want # to evaluate it until render time. + # FIXME: This isn't totally consistent, because it eventually returns a + # bytestring rather than a unicode object. It works wherever we use + # smart_unicode() at the moment. Fixing this requires work in the + # i18n internals. return s if not isinstance(s, basestring,): if hasattr(s, '__unicode__'):