Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Change some string literals to be unicode, because:

    * It's the most micro of optimizations (forget I even said it)
    * It makes significantly more sense semantically, given these are functions which return unicode.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e35ba97740dbfe5497c2517510dc55f6aa431300 1 parent 4725a73
@alex alex authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  django/template/base.py
  2. +2 −2 django/utils/encoding.py
View
2  django/template/base.py
@@ -817,7 +817,7 @@ def render(self, context):
bits.append(self.render_node(node, context))
else:
bits.append(node)
- return mark_safe(''.join([force_unicode(b) for b in bits]))
+ return mark_safe(u''.join([force_unicode(b) for b in bits]))
def get_nodes_by_type(self, nodetype):
"Return a list of all nodes of the given type"
View
4 django/utils/encoding.py
@@ -81,7 +81,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
# without raising a further exception. We do an
# approximation to what the Exception's standard str()
# output should be.
- s = ' '.join([force_unicode(arg, encoding, strings_only,
+ s = u' '.join([force_unicode(arg, encoding, strings_only,
errors) for arg in s])
elif not isinstance(s, unicode):
# Note: We use .decode() here, instead of unicode(s, encoding,
@@ -97,7 +97,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
# working unicode method. Try to handle this without raising a
# further exception by individually forcing the exception args
# to unicode.
- s = ' '.join([force_unicode(arg, encoding, strings_only,
+ s = u' '.join([force_unicode(arg, encoding, strings_only,
errors) for arg in s])
return s
Please sign in to comment.
Something went wrong with that request. Please try again.