Stopped using dict.iter*.

Since performance isn't a primary concern, the non-iterable versions
will do just fine on Python 2.

10 files changed, 14 insertions, 14 deletions

diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 80a3b46..1272dfc 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -168,7 +168,7 @@ class CacheDebugPanel(DebugPanel):
             else:
                 self.hits += 1
         elif name == 'get_many':
-            for key, value in return_value.iteritems():
+            for key, value in return_value.items():
                 if value is None:
                     self.misses += 1
                 else:
diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py
index 6adb279..f71472b 100644
--- a/debug_toolbar/panels/profiling.py
+++ b/debug_toolbar/panels/profiling.py
@@ -23,7 +23,7 @@ class DjangoDebugToolbarStats(Stats):
 
     def get_root_func(self):
         if self.__root is None:
-            for func, (cc, nc, tt, ct, callers) in self.stats.iteritems():
+            for func, (cc, nc, tt, ct, callers) in self.stats.items():
                 if len(callers) == 0:
                     self.__root = func
                     break
@@ -80,7 +80,7 @@ class FunctionCall(object):
         i = 0
         h, s, v = self.hsv
         count = len(self.statobj.all_callees[self.func])
-        for func, stats in self.statobj.all_callees[self.func].iteritems():
+        for func, stats in self.statobj.all_callees[self.func].items():
             i += 1
             h1 = h + (i / count) / (self.depth + 1)
             if stats[3] == 0:
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index 936c964..5bf3e7f 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -55,5 +55,5 @@ class RequestVarsDebugPanel(DebugPanel):
         if hasattr(self.request, 'session'):
             self.record_stats({
                 'session': [(k, self.request.session.get(k))
-                            for k in self.request.session.iterkeys()]
+                            for k in self.request.session.keys()]
                 })
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 7afc6eb..bc70b97 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -139,7 +139,7 @@ class SQLDebugPanel(DebugPanel):
         if self._queries:
             width_ratio_tally = 0
             factor = int(256.0 / (len(self._databases) * 2.5))
-            for n, db in enumerate(self._databases.itervalues()):
+            for n, db in enumerate(self._databases.values()):
                 rgb = [0, 0, 0]
                 color = n % 3
                 rgb[color] = 256 - n / 3 * factor
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 889177a..95794d5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -22,14 +22,14 @@
 <table>
 	<thead>
 	<tr>
-	{% for name in counts.iterkeys %}
+	{% for name in counts.keys %}
 		<th>{{ name }}</th>
 	{% endfor %}
 	</tr>
 	</thead>
 	<tbody>
 	<tr>
-	{% for value in counts.itervalues %}
+	{% for value in counts.values %}
 		<td>{{ value }}</td>
 	{% endfor %}
 	</tr>
@@ -66,4 +66,4 @@
 	{% endfor %}
 	</tbody>
 </table>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index f251056..981b847 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -7,7 +7,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		{% for key, value in headers.iteritems %}
+		{% for key, value in headers.items %}
 			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ key|escape }}</td>
 				<td>{{ value|escape }}</td>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index bde09a9..7e44a46 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -31,7 +31,7 @@
 <h4>{% blocktrans count context_processors|length as context_processors_count %}Context processor{% plural %}Context processors{% endblocktrans %}</h4>
 {% if context_processors %}
 <dl>
-{% for key, value in context_processors.iteritems %}
+{% for key, value in context_processors.items %}
 	<dt><strong>{{ key|escape }}</strong></dt>
 	<dd>
 		<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">&#x25B6;</span> {% trans 'Toggle Context' %}</a></div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/versions.html b/debug_toolbar/templates/debug_toolbar/panels/versions.html
index 283d052..2c614f1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/versions.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/versions.html
@@ -7,7 +7,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		{% for package, version in versions.iteritems %}
+		{% for package, version in versions.items %}
 			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ package }}</td>
 				<td>{{ version }}</td>
diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py
index f87f01c..dfcdd5c 100644
--- a/debug_toolbar/utils/tracking/db.py
+++ b/debug_toolbar/utils/tracking/db.py
@@ -84,7 +84,7 @@ class NormalCursorWrapper(object):
             return params
         if isinstance(params, dict):
             return dict((key, self._quote_expr(value))
-                            for key, value in params.iteritems())
+                            for key, value in params.items())
         return map(self._quote_expr, params)
 
     def _decode(self, param):
diff --git a/tests/tests.py b/tests/tests.py
index cdf1a9e..dd7391d 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -32,12 +32,12 @@ class Settings(object):
         self._orig = {}
 
     def __enter__(self):
-        for k, v in self.overrides.iteritems():
+        for k, v in self.overrides.items():
             self._orig[k] = getattr(settings, k, self.NotDefined)
             setattr(settings, k, v)
 
     def __exit__(self, exc_type, exc_value, traceback):
-        for k, v in self._orig.iteritems():
+        for k, v in self._orig.items():
             if v is self.NotDefined:
                 delattr(settings, k)
             else: