use iteritems from six, or items in templates

debug_toolbar/panels/cache.py

@@ -10,6 +10,7 @@
 from django.template import Node
 from django.utils.datastructures import SortedDict
 from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.six import iteritems
 
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils import (tidy_stacktrace, render_stacktrace,
@@ -166,7 +167,7 @@ def _store_call_info(self, sender, name=None, time_taken=0,
             else:
                 self.hits += 1
         elif name == 'get_many':
-            for key, value in return_value.iteritems():
+            for key, value in iteritems(return_value):
                 if value is None:
                     self.misses += 1
                 else:

debug_toolbar/panels/profiling.py

@@ -1,5 +1,6 @@
 from __future__ import division
 
+from django.utils.six import iteritems
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 from debug_toolbar.panels import DebugPanel
@@ -23,7 +24,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 iteritems(self.stats):
                 if len(callers) == 0:
                     self.__root = func
                     break
@@ -80,7 +81,7 @@ def subfuncs(self):
         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 iteritems(self.statobj.all_callees[self.func]):
             i += 1
             h1 = h + (i / count) / (self.depth + 1)
             if stats[3] == 0:

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>

debug_toolbar/templates/debug_toolbar/panels/templates.html

@@ -31,7 +31,7 @@ <h4>{% blocktrans count templates|length as template_count %}Template{% plural %
 <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>

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>

debug_toolbar/utils/tracking/db.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 from django.template import Node
 from django.utils.encoding import force_text, smart_str
+from django.utils.six import iteritems
 
 from debug_toolbar.utils import ms_from_timedelta, tidy_stacktrace, \
                                 get_template_info, get_stack
@@ -88,7 +89,7 @@ def _quote_expr(self, element):
     def _quote_params(self, params):
         if isinstance(params, dict):
             return dict((key, self._quote_expr(value))
-                            for key, value in params.iteritems())
+                            for key, value in iteritems(params))
         return map(self._quote_expr, params)
 
     def _decode(self, param):

tests/tests.py

@@ -1,5 +1,6 @@
 from __future__ import with_statement
 from django.utils.six.moves import _thread
+from django.utils.six import iteritems
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -30,12 +31,12 @@ def __init__(self, **overrides):
         self._orig = {}
 
     def __enter__(self):
-        for k, v in self.overrides.iteritems():
+        for k, v in iteritems(self.overrides):
             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 iteritems(self._orig):
             if v is self.NotDefined:
                 delattr(settings, k)
             else: