p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25743 -- Optimized utils.localize() and localize_input() 

Bail early if the input is a string since that's the most common case.
This commit is contained in:
Jaap Roes 2015-11-12 14:59:37 +01:00 committed by Tim Graham
parent 91a431f48c
commit 9a2aca6030
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/formats.py
View File

@ -172,7 +172,9 @@ def localize(value, use_l10n=None):
If use_l10n is provided and is not None, that will force the value to If use_l10n is provided and is not None, that will force the value to
be localized (or not), overriding the value of settings.USE_L10N. be localized (or not), overriding the value of settings.USE_L10N.
""" """
if isinstance(value, bool): if isinstance(value, six.string_types): # Handle strings first for performance reasons.
return value
elif isinstance(value, bool): # Make sure booleans don't get treated as numbers
return mark_safe(six.text_type(value)) return mark_safe(six.text_type(value))
elif isinstance(value, (decimal.Decimal, float) + six.integer_types): elif isinstance(value, (decimal.Decimal, float) + six.integer_types):
return number_format(value, use_l10n=use_l10n) return number_format(value, use_l10n=use_l10n)
@ -182,8 +184,7 @@ def localize(value, use_l10n=None):
return date_format(value, use_l10n=use_l10n) return date_format(value, use_l10n=use_l10n)
elif isinstance(value, datetime.time): elif isinstance(value, datetime.time):
return time_format(value, 'TIME_FORMAT', use_l10n=use_l10n) return time_format(value, 'TIME_FORMAT', use_l10n=use_l10n)
else: return value
return value
def localize_input(value, default=None): def localize_input(value, default=None):
@ -191,7 +192,9 @@ def localize_input(value, default=None):
Checks if an input value is a localizable type and returns it Checks if an input value is a localizable type and returns it
formatted with the appropriate formatting string of the current locale. formatted with the appropriate formatting string of the current locale.
""" """
if isinstance(value, (decimal.Decimal, float) + six.integer_types): if isinstance(value, six.string_types): # Handle strings first for performance reasons.
return value
elif isinstance(value, (decimal.Decimal, float) + six.integer_types):
return number_format(value) return number_format(value)
elif isinstance(value, datetime.datetime): elif isinstance(value, datetime.datetime):
value = datetime_safe.new_datetime(value) value = datetime_safe.new_datetime(value)