diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-07-20 21:14:27 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-07 12:00:22 +0200 |
| commit | ee191715eae73362768184aa95206cf61bac5d38 (patch) | |
| tree | f6ffc0bf4dfaea9f91cf8536ba2aeb9a69a81a6d /django/conf/__init__.py | |
| parent | fa3f0aa021bea85b9196ef154a32c7bb1023a1e9 (diff) | |
[py3] Fixed access to dict keys/values/items.
Diffstat (limited to 'django/conf/__init__.py')
| -rw-r--r-- | django/conf/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 77454b3fb9..6325ccb1a9 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -158,7 +158,7 @@ class UserSettingsHolder(BaseSettings): return getattr(self.default_settings, name) def __dir__(self): - return self.__dict__.keys() + dir(self.default_settings) + return list(six.iterkeys(self.__dict__)) + dir(self.default_settings) # For Python < 2.6: __members__ = property(lambda self: self.__dir__()) |