innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Alex Gaynor 2011-10-11 17:36:05 +00:00
parent 4725a732e7
commit e35ba97740
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/base.py
View File

@ -817,7 +817,7 @@ class NodeList(list):
bits.append(self.render_node(node, context)) bits.append(self.render_node(node, context))
else: else:
bits.append(node) 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): def get_nodes_by_type(self, nodetype):
"Return a list of all nodes of the given type" "Return a list of all nodes of the given type"

4
django/utils/encoding.py
View File

@ -81,7 +81,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
# without raising a further exception. We do an # without raising a further exception. We do an
# approximation to what the Exception's standard str() # approximation to what the Exception's standard str()
# output should be. # 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]) errors) for arg in s])
elif not isinstance(s, unicode): elif not isinstance(s, unicode):
# Note: We use .decode() here, instead of unicode(s, encoding, # 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 # working unicode method. Try to handle this without raising a
# further exception by individually forcing the exception args # further exception by individually forcing the exception args
# to unicode. # to unicode.
s = ' '.join([force_unicode(arg, encoding, strings_only, s = u' '.join([force_unicode(arg, encoding, strings_only,
errors) for arg in s]) errors) for arg in s])
return s return s