summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollin Anderson <cmawebsite@gmail.com>2022-02-22 14:26:51 -0500
committerGitHub <noreply@github.com>2022-02-22 20:26:51 +0100
commit7fd2deb3e86a021b3108027d786d45657243532c (patch)
tree0776d11428a074fddd02f296290df9b1e5af0502
parent7c318a8bdd66f8c5241864c9970dddb525d0ca4c (diff)
Refs #32873 -- Avoided looking up settings._USE_L10N_INTERNAL twice.
-rw-r--r--django/utils/formats.py26
1 files changed, 10 insertions, 16 deletions
diff --git a/django/utils/formats.py b/django/utils/formats.py
index ba569974ed..3f38322d84 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -106,14 +106,11 @@ def get_format(format_type, lang=None, use_l10n=None):
If use_l10n is provided and is not None, it forces the value to
be localized (or not), overriding the value of settings.USE_L10N.
"""
- use_l10n = use_l10n or (
- use_l10n is None
- and (
- settings._USE_L10N_INTERNAL
- if hasattr(settings, "_USE_L10N_INTERNAL")
- else settings.USE_L10N
- )
- )
+ if use_l10n is None:
+ try:
+ use_l10n = settings._USE_L10N_INTERNAL
+ except AttributeError:
+ use_l10n = settings.USE_L10N
if use_l10n and lang is None:
lang = get_language()
cache_key = (format_type, lang)
@@ -181,14 +178,11 @@ def number_format(value, decimal_pos=None, use_l10n=None, force_grouping=False):
If use_l10n is provided and is not None, it forces the value to
be localized (or not), overriding the value of settings.USE_L10N.
"""
- use_l10n = use_l10n or (
- use_l10n is None
- and (
- settings._USE_L10N_INTERNAL
- if hasattr(settings, "_USE_L10N_INTERNAL")
- else settings.USE_L10N
- )
- )
+ if use_l10n is None:
+ try:
+ use_l10n = settings._USE_L10N_INTERNAL
+ except AttributeError:
+ use_l10n = settings.USE_L10N
lang = get_language() if use_l10n else None
return numberformat.format(
value,