test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #21052 -- Small performance optimization.

This commit is contained in:
Aymeric Augustin 2013-09-06 10:34:32 -05:00
parent e492ab8e7e
commit b80be68e08
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/encoding.py
View File

@ -60,8 +60,7 @@ def force_text(s, encoding='utf-8', strings_only=False, errors='strict'):
If strings_only is True, don't convert (some) non-string-like objects. If strings_only is True, don't convert (some) non-string-like objects.
""" """
# Handle the common case first, saves 30-40% when s is an instance of # Handle the common case first for performance reasons.
# six.text_type. This function gets called often in that setting.
if isinstance(s, six.text_type): if isinstance(s, six.text_type):
return s return s
if strings_only and is_protected_type(s): if strings_only and is_protected_type(s):
@ -115,8 +114,7 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
If strings_only is True, don't convert (some) non-string-like objects. If strings_only is True, don't convert (some) non-string-like objects.
""" """
if isinstance(s, six.memoryview): # Handle the common case first for performance reasons.
s = bytes(s)
if isinstance(s, bytes): if isinstance(s, bytes):
if encoding == 'utf-8': if encoding == 'utf-8':
return s return s
@ -124,6 +122,8 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
return s.decode('utf-8', errors).encode(encoding, errors) return s.decode('utf-8', errors).encode(encoding, errors)
if strings_only and is_protected_type(s): if strings_only and is_protected_type(s):
return s return s
if isinstance(s, six.memoryview):
return bytes(s)
if isinstance(s, Promise): if isinstance(s, Promise):
return six.text_type(s).encode(encoding, errors) return six.text_type(s).encode(encoding, errors)
if not isinstance(s, six.string_types): if not isinstance(s, six.string_types):