diff --git a/django/utils/formats.py b/django/utils/formats.py index 1eb7a3d837a..3c43f52f2f1 100644 --- a/django/utils/formats.py +++ b/django/utils/formats.py @@ -36,12 +36,12 @@ def iter_format_modules(lang): def get_format_modules(reverse=False): """ - Returns an iterator over the format modules found + Returns a list of the format modules found """ lang = get_language() modules = _format_modules_cache.setdefault(lang, list(iter_format_modules(lang))) if reverse: - modules.reverse() + return list(reversed(modules)) return modules def get_format(format_type, lang=None, use_l10n=None): diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index 055656b3cb0..d023462311e 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -9,7 +9,7 @@ from threading import local from django.conf import settings from django.template import Template, Context from django.utils.formats import (get_format, date_format, time_format, - localize, localize_input, iter_format_modules) + localize, localize_input, iter_format_modules, get_format_modules) from django.utils.importlib import import_module from django.utils.numberformat import format as nformat from django.utils.safestring import mark_safe, SafeString, SafeUnicode @@ -495,6 +495,19 @@ class FormattingTests(TestCase): finally: settings.USE_L10N = old_l10n + def test_get_format_modules_stability(self): + activate('de') + old_format_module_path = settings.FORMAT_MODULE_PATH + settings.FORMAT_MODULE_PATH = 'regressiontests.i18n.other.locale' + try: + settings.USE_L10N = True + old = "%r" % get_format_modules(reverse=True) + new = "%r" % get_format_modules(reverse=True) # second try + self.assertEqual(new, old, 'Value returned by get_formats_modules() must be preserved between calls.') + finally: + settings.FORMAT_MODULE_PATH = old_format_module_path + deactivate() + def test_localize_templatetag_and_filter(self): """ Tests the {% localize %} templatetag