use iterkeys and itervalues from six, or .keys and .values in templates

debug_toolbar/panels/request_vars.py

@@ -1,6 +1,7 @@
 from django.core.urlresolvers import resolve
 from django.http import Http404
 from django.utils.translation import ugettext_lazy as _
+from django.utils.six import iterkeys
 
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils import get_name_from_obj
@@ -53,5 +54,5 @@ def process_response(self, request, response):
         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 iterkeys(self.request.session)]
                 })

debug_toolbar/panels/sql.py

@@ -5,6 +5,7 @@
 from django.db.backends import BaseDatabaseWrapper
 from django.utils.html import escape
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy as __
+from django.utils.six import itervalues
 
 from debug_toolbar.utils.compat.db import connections
 from debug_toolbar.middleware import DebugToolbarMiddleware
@@ -135,7 +136,7 @@ def process_response(self, request, response):
         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(itervalues(self._databases)):
                 rgb = [0, 0, 0]
                 color = n % 3
                 rgb[color] = 256 - n / 3 * factor

debug_toolbar/templates/debug_toolbar/panels/cache.html

@@ -22,14 +22,14 @@ <h3>{% trans "Commands" %}</h3>
 <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>