summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-05-19 08:22:46 -0400
committerTim Graham <timograham@gmail.com>2014-05-19 08:22:46 -0400
commit5abc811a40dbeee092b9f50055d229e9c24274fa (patch)
tree5825f6ff9b917c16a44c25769c3eaa1d9ab1ae36 /django
parenta1f0c4c697e8d848ce43ad8ce346a058f288db19 (diff)
Revert "Fixed #20477: Allowed settings.FORMAT_MODULE_PATH to be a list of modules."
This reverts commit 950b6de16ac2f8135612f2ed5984c090dd8e4dcf.
Diffstat (limited to 'django')
-rw-r--r--django/utils/formats.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/django/utils/formats.py b/django/utils/formats.py
index 5bb8d75df7..fc68179f3a 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -47,15 +47,10 @@ def iter_format_modules(lang, format_module_path=None):
Does the heavy lifting of finding format modules.
"""
if check_for_language(lang):
- format_locations = []
- if settings.FORMAT_MODULE_PATH:
- if isinstance(settings.FORMAT_MODULE_PATH, six.string_types):
- format_module_path_setting = [settings.FORMAT_MODULE_PATH]
- else:
- format_module_path_setting = settings.FORMAT_MODULE_PATH
- for path in format_module_path_setting:
- format_locations.append(path + '.%s')
- format_locations.append('django.conf.locale.%s')
+ format_locations = ['django.conf.locale.%s']
+ if format_module_path:
+ format_locations.append(format_module_path + '.%s')
+ format_locations.reverse()
locale = to_locale(lang)
locales = [locale]
if '_' in locale: