openstack/deb-python-django-appconf
Code Issues Proposed changes

Remove Python < 2.6 __members__ support

Browse Source
This commit is contained in:
Carlton Gibson
2016-03-19 21:00:22 +01:00
parent 190e5d3313
commit c323ecdf8c
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appconf/base.py
View File

@@ -122,11 +122,6 @@ class AppConf(six.with_metaclass(AppConfMetaClass)):
def configured_data(self):
return self._meta.configured_data
# For Python < 2.6:
@property
def __members__(self):
return self.__dir__()
def __getattr__(self, name):
if self._meta.proxy:
return getattr(self._meta.holder, name)

4
tests/tests.py
View File

@@ -52,12 +52,8 @@ class TestConfTests(TestCase):
def test_dir_members(self):
custom_conf = TestConf()
self.assertTrue('TESTS_SIMPLE_VALUE' in dir(settings))
if hasattr(settings, '__members__'): # django 1.5 removed __members__
self.assertTrue('TESTS_SIMPLE_VALUE' in settings.__members__)
self.assertTrue('SIMPLE_VALUE' in dir(custom_conf))
self.assertTrue('SIMPLE_VALUE' in custom_conf.__members__)
self.assertFalse('TESTS_SIMPLE_VALUE' in dir(custom_conf))
self.assertFalse('TESTS_SIMPLE_VALUE' in custom_conf.__members__)
def test_custom_holder(self):
CustomHolderConf()