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

Fixed #12493 -- Deprecated auto-correction of TEMPLATE_DIRS

This commit is contained in:
Claude Paroz 2012-06-30 15:06:42 +02:00
parent 596e15293c
commit db87016b1a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/conf/__init__.py
View File

@ -103,6 +103,9 @@ class Settings(BaseSettings):
setting_value = getattr(mod, setting) setting_value = getattr(mod, setting)
if setting in tuple_settings and \ if setting in tuple_settings and \
isinstance(setting_value, basestring): isinstance(setting_value, basestring):
warnings.warn("The %s setting must be a tuple. Please fix your "
"settings, as auto-correction is now deprecated." % setting,
PendingDeprecationWarning)
setting_value = (setting_value,) # In case the user forgot the comma. setting_value = (setting_value,) # In case the user forgot the comma.
setattr(self, setting, setting_value) setattr(self, setting, setting_value)

4
docs/internals/deprecation.txt
View File

@ -276,6 +276,10 @@ these changes.
* The function ``django.utils.itercompat.product`` will be removed. The Python * The function ``django.utils.itercompat.product`` will be removed. The Python
builtin version should be used instead. builtin version should be used instead.
* Auto-correction of INSTALLED_APPS and TEMPLATE_DIRS settings when they are
specified as a plain string instead of a tuple will be removed and raise an
exception.
2.0 2.0
--- ---