p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed test failures on Python 3 - refs #12288

This commit is contained in:
Tim Graham 2013-08-09 09:12:15 -04:00
parent b575d690bb
commit 9c711ee3a6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/conf/__init__.py
View File

@ -107,8 +107,10 @@ class BaseSettings(object):
elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types): elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):
raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set " raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "
"to a tuple, not a string.") "to a tuple, not a string.")
elif name == "INSTALLED_APPS" and len(value) != len(set(value)): elif name == "INSTALLED_APPS":
raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique values.") value = list(value) # force evaluation of generators on Python 3
if len(value) != len(set(value)):
raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique values.")
object.__setattr__(self, name, value) object.__setattr__(self, name, value)

2
tests/settings_tests/tests.py
View File

@ -226,7 +226,7 @@ class TestComplexSettingOverride(TestCase):
self.assertEqual('Overriding setting TEST_WARN can lead to unexpected behaviour.', str(w[-1].message)) self.assertEqual('Overriding setting TEST_WARN can lead to unexpected behaviour.', str(w[-1].message))
class UniqueSettngsTests(TestCase): class UniqueSettingsTests(TestCase):
""" """
Tests for the INSTALLED_APPS setting. Tests for the INSTALLED_APPS setting.
""" """