summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2012-08-08 07:33:15 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2012-08-08 07:33:15 -0700
commit4c97101b1f0815a3f311fc77483b935fe62966bb (patch)
tree82ee3da7678a31c27d17ea73a4c85e58f1fa41fc /django/utils
parent576ec12f8e7024679202b6213b8664ccd8b451b7 (diff)
remove a bunch of unnescesarry iterkeys() calls
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/datastructures.py2
-rw-r--r--django/utils/dictconfig.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index bbd31ad36c..ad17573104 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -129,7 +129,7 @@ class SortedDict(dict):
data = list(data)
super(SortedDict, self).__init__(data)
if isinstance(data, dict):
- self.keyOrder = list(six.iterkeys(data))
+ self.keyOrder = list(data)
else:
self.keyOrder = []
seen = set()
diff --git a/django/utils/dictconfig.py b/django/utils/dictconfig.py
index f8d6eebf89..c7b39819b5 100644
--- a/django/utils/dictconfig.py
+++ b/django/utils/dictconfig.py
@@ -363,7 +363,7 @@ class DictConfigurator(BaseConfigurator):
#which were in the previous configuration but
#which are not in the new configuration.
root = logging.root
- existing = list(six.iterkeys(root.manager.loggerDict))
+ existing = list(root.manager.loggerDict)
#The list needs to be sorted so that we can
#avoid disabling child loggers of explicitly
#named loggers. With a sorted list it is easier