Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added a FIXME that I forgot to include earlier.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 56d56e5bac2923382fd10036dbe045412390362d 1 parent 5f2c513
Malcolm Tredinnick malcolmt authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 django/utils/encoding.py
4 django/utils/encoding.py
View
@@ -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__'):
Please sign in to comment.
Something went wrong with that request. Please try again.