Ticket #14290: l10n_performance.diff

django/utils/formats.py

@@ -7 +7 @@
 from django.utils.encoding import smart_str
 from django.utils import dateformat, numberformat, datetime_safe
 
+
+# _cached_formats is a mapping from format_type to a 1-tuple. This allows 
+# us to separate 3 distinct cases:
+#      (None,)            the format_type was checked previously, but 
+#                         no value was found.
+#      (<format value>, ) the previously fetched value for format_type
+#                         is format_value
+#      if a format_type key is not in _cached_formats, then format_type
+#      hasn't yet been fetched.
+_cached_formats = {}
+
 def get_format_modules(reverse=False):
     """
     Returns an iterator over the format modules found in the project and Django
@@ -34 +45 @@
         modules.reverse()
     return modules
 
+
 def get_format(format_type):
     """
     For a specific format type, returns the format for the current
@@ -42 +54 @@
     """
     format_type = smart_str(format_type)
     if settings.USE_L10N:
-        for module in get_format_modules():
-            try:
-                return getattr(module, format_type)
-            except AttributeError:
+        global _cached_formats
+        cached_value = _cached_formats.get(format_type, None)
+        if cached_value:
+            if cached_value[0]:
+                return cached_value[0]
+            else:
+                # format_type was previously checked, but didn't have a value
                 pass
+        else:
+            for module in get_format_modules():                
+                try:
+                    format_value = getattr(module, format_type)
+                    _cached_formats[format_type] = (format_value,)
+                    return format_value
+                except AttributeError:
+                    pass
+            _cached_formats[format_type] = (None,)
     return getattr(settings, format_type)
 
 def date_format(value, format=None):

AUTHORS

@@ -276 +276 @@
     knox <christobzr@gmail.com>
     David Krauth
     Kevin Kubasik <kevin@kubasik.net>
+    Teemu Kurppa <http://dirtyaura.org>
     kurtiss@meetro.com
     Denis Kuzmichyov <kuzmichyov@gmail.com>
     Panos Laganakos <panos.laganakos@gmail.com>