summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-21 11:20:22 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-21 11:20:22 +0200
commitab2f65bb7f9083b5fac777f5e3b7872c58837f4f (patch)
treec0a93262a9b60cb108713204afb39fb561bb1e6a
parente89bc39935afc5096e6a51a49874b2d30cbc2b5e (diff)
Removed obsolete __members__ definitions
This was useful for pre-Python 2.6 support. See commit c6e8e5d9.
-rw-r--r--django/conf/__init__.py3
-rw-r--r--django/utils/functional.py1
2 files changed, 0 insertions, 4 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index e1c3fd1808..35f4ec8397 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -160,9 +160,6 @@ class UserSettingsHolder(BaseSettings):
def __dir__(self):
return list(self.__dict__) + dir(self.default_settings)
- # For Python < 2.6:
- __members__ = property(lambda self: self.__dir__())
-
settings = LazySettings()
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 085ec40b63..085a8fce59 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -238,7 +238,6 @@ class LazyObject(object):
raise NotImplementedError
# introspection support:
- __members__ = property(lambda self: self.__dir__())
__dir__ = new_method_proxy(dir)