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

Moved a settings usage up the stack in utils/formats.py #unsettings

This commit is contained in:
Adrian Holovaty 2013-09-06 17:01:23 -05:00
parent 0b7cf56e28
commit e844e10b4f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/formats.py
View File

@ -40,14 +40,14 @@ def reset_format_cache():
_format_cache = {} _format_cache = {}
_format_modules_cache = {} _format_modules_cache = {}
def iter_format_modules(lang): def iter_format_modules(lang, format_module_path=None):
""" """
Does the heavy lifting of finding format modules. Does the heavy lifting of finding format modules.
""" """
if check_for_language(lang): if check_for_language(lang):
format_locations = ['django.conf.locale.%s'] format_locations = ['django.conf.locale.%s']
if settings.FORMAT_MODULE_PATH: if format_module_path:
format_locations.append(settings.FORMAT_MODULE_PATH + '.%s') format_locations.append(format_module_path + '.%s')
format_locations.reverse() format_locations.reverse()
locale = to_locale(lang) locale = to_locale(lang)
locales = [locale] locales = [locale]
@ -66,7 +66,7 @@ def get_format_modules(lang=None, reverse=False):
""" """
if lang is None: if lang is None:
lang = get_language() lang = get_language()
modules = _format_modules_cache.setdefault(lang, list(iter_format_modules(lang))) modules = _format_modules_cache.setdefault(lang, list(iter_format_modules(lang, settings.FORMAT_MODULE_PATH)))
if reverse: if reverse:
return list(reversed(modules)) return list(reversed(modules))
return modules return modules

5
tests/i18n/tests.py
View File

@ -728,9 +728,8 @@ class FormattingTests(TransRealMixin, TestCase):
with translation.override('de-at', deactivate=True): with translation.override('de-at', deactivate=True):
de_format_mod = import_module('django.conf.locale.de.formats') de_format_mod = import_module('django.conf.locale.de.formats')
self.assertEqual(list(iter_format_modules('de')), [de_format_mod]) self.assertEqual(list(iter_format_modules('de')), [de_format_mod])
with self.settings(FORMAT_MODULE_PATH='i18n.other.locale'): test_de_format_mod = import_module('i18n.other.locale.de.formats')
test_de_format_mod = import_module('i18n.other.locale.de.formats') self.assertEqual(list(iter_format_modules('de', 'i18n.other.locale')), [test_de_format_mod, de_format_mod])
self.assertEqual(list(iter_format_modules('de')), [test_de_format_mod, de_format_mod])
def test_iter_format_modules_stability(self): def test_iter_format_modules_stability(self):
""" """