diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2013-06-28 14:50:06 -0300 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2013-06-28 21:48:16 -0300 |
| commit | 5e08b792eff2a3ca340ad5a8a568c665e52ec39e (patch) | |
| tree | d5ec1eb0394020783108533a35c735936fe5363c /django/conf/__init__.py | |
| parent | f73d04dda9f1a96acdab77dacd7bdeaad66ad736 (diff) | |
Stop auto-correcting string INSTALLED_APPS, TEMPLATE_DIRS settings, as per deprecation TL.
Diffstat (limited to 'django/conf/__init__.py')
| -rw-r--r-- | django/conf/__init__.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 61584391cd..b1f40af80a 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -132,19 +132,9 @@ class Settings(BaseSettings): % (self.SETTINGS_MODULE, e) ) - # Settings that should be converted into tuples if they're mistakenly entered - # as strings. - tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS") - for setting in dir(mod): if setting == setting.upper(): setting_value = getattr(mod, setting) - if setting in tuple_settings and \ - isinstance(setting_value, six.string_types): - warnings.warn("The %s setting must be a tuple. Please fix your " - "settings, as auto-correction is now deprecated." % setting, - DeprecationWarning, stacklevel=2) - setting_value = (setting_value,) # In case the user forgot the comma. setattr(self, setting, setting_value) if not self.SECRET_KEY: |
