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

Optimize is_protected_type slightly (used by force_text, which is used basically everywhere)

This commit is contained in:
Alex Gaynor 2014-06-07 20:36:59 -07:00
parent 4ce7a6bc84
commit d8f6b55aa8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/encoding.py
View File

@ -52,14 +52,17 @@ def smart_text(s, encoding='utf-8', strings_only=False, errors='strict'):
return force_text(s, encoding, strings_only, errors) return force_text(s, encoding, strings_only, errors)
_PROTECTED_TYPES = six.integer_types + (type(None), float, Decimal,
datetime.datetime, datetime.date, datetime.time)
def is_protected_type(obj): def is_protected_type(obj):
"""Determine if the object instance is of a protected type. """Determine if the object instance is of a protected type.
Objects of protected types are preserved as-is when passed to Objects of protected types are preserved as-is when passed to
force_text(strings_only=True). force_text(strings_only=True).
""" """
return isinstance(obj, six.integer_types + (type(None), float, Decimal, return isinstance(obj, _PROTECTED_TYPES)
datetime.datetime, datetime.date, datetime.time))
def force_text(s, encoding='utf-8', strings_only=False, errors='strict'): def force_text(s, encoding='utf-8', strings_only=False, errors='strict'):