Merged graingert/patch-2 to master.

Author: tricoder42

.travis.yml

@@ -6,6 +6,13 @@ env:
   - DJANGO_VERSION=1.3.7
   - DJANGO_VERSION=1.4.5
   - DJANGO_VERSION=1.5.1
+matrix:
+  include:
+    - python: 3.2
+      env: DJANGO_VERSION=1.5.1
+    - python: 3.3
+      env: DJANGO_VERSION=1.5.1
 install:
   - pip install Django==$DJANGO_VERSION
+  - python setup.py install
 script: python setup.py test

debug_toolbar/__init__.py

@@ -3,5 +3,5 @@
 try:
     VERSION = __import__('pkg_resources') \
         .get_distribution('django-debug-toolbar').version
-except Exception, e:
+except Exception as e:
     VERSION = 'unknown'

debug_toolbar/management/commands/debugsqlshell.py

@@ -1,9 +1,11 @@
+from __future__ import print_function
 from datetime import datetime
 
 from django.db.backends import util
 from django.core.management.commands.shell import Command
 
-from debug_toolbar.utils import ms_from_timedelta, sqlparse
+from debug_toolbar.utils import ms_from_timedelta
+import sqlparse
 
 
 class PrintQueryWrapper(util.CursorDebugWrapper):
@@ -14,8 +16,8 @@ def execute(self, sql, params=()):
         finally:
             raw_sql = self.db.ops.last_executed_query(self.cursor, sql, params)
             execution_time = datetime.now() - starttime
-            print sqlparse.format(raw_sql, reindent=True),
-            print ' [%.2fms]' % (ms_from_timedelta(execution_time),)
-            print
+            print(sqlparse.format(raw_sql, reindent=True),)
+            print(' [%.2fms]' % (ms_from_timedelta(execution_time),))
+            print()
 
 util.CursorDebugWrapper = PrintQueryWrapper

debug_toolbar/middleware.py

@@ -1,20 +1,21 @@
+from __future__ import unicode_literals
 """
 Debug Toolbar middleware
 """
 import imp
-import threading
+from django.utils.six.moves import _thread
 
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_text
 from django.utils.importlib import import_module
+from django.utils.six import string_types
 
 import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
-threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
 
 
 def replace_insensitive(string, target, replacement):
@@ -39,7 +40,7 @@ class DebugToolbarMiddleware(object):
 
     @classmethod
     def get_current(cls):
-        return cls.debug_toolbars.get(threading.currentThread().ident)
+        return cls.debug_toolbars.get(_thread.get_ident())
 
     def __init__(self):
         self._urlconfs = {}
@@ -48,7 +49,7 @@ def __init__(self):
         self.show_toolbar = self._show_toolbar  # default
 
         # The tag to attach the toolbar to
-        self.tag = u'</body>'
+        self.tag = '</body>'
 
         if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'):
             show_toolbar_callback = settings.DEBUG_TOOLBAR_CONFIG.get(
@@ -58,7 +59,7 @@ def __init__(self):
 
             tag = settings.DEBUG_TOOLBAR_CONFIG.get('TAG', None)
             if tag:
-                self.tag = u'</' + tag + u'>'
+                self.tag = '</' + tag + '>'
 
     def _show_toolbar(self, request):
         if getattr(settings, 'TEST', False):
@@ -77,13 +78,13 @@ def process_request(self, request):
         __traceback_hide__ = True
         if self.show_toolbar(request):
             urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
-            if isinstance(urlconf, basestring):
+            if isinstance(urlconf, string_types):
                 urlconf = import_module(getattr(request, 'urlconf', settings.ROOT_URLCONF))
 
             if urlconf not in self._urlconfs:
                 new_urlconf = imp.new_module('urlconf')
                 new_urlconf.urlpatterns = debug_toolbar.urls.urlpatterns + \
-                        list(urlconf.urlpatterns)
+                    list(urlconf.urlpatterns)
 
                 if hasattr(urlconf, 'handler403'):
                     new_urlconf.handler403 = urlconf.handler403
@@ -99,11 +100,11 @@ def process_request(self, request):
             toolbar = DebugToolbar(request)
             for panel in toolbar.panels:
                 panel.process_request(request)
-            self.__class__.debug_toolbars[threading.currentThread().ident] = toolbar
+            self.__class__.debug_toolbars[_thread.get_ident()] = toolbar
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         __traceback_hide__ = True
-        toolbar = self.__class__.debug_toolbars.get(threading.currentThread().ident)
+        toolbar = self.__class__.debug_toolbars.get(_thread.get_ident())
         if not toolbar:
             return
         result = None
@@ -115,7 +116,7 @@ def process_view(self, request, view_func, view_args, view_kwargs):
 
     def process_response(self, request, response):
         __traceback_hide__ = True
-        ident = threading.currentThread().ident
+        ident = _thread.get_ident()
         toolbar = self.__class__.debug_toolbars.get(ident)
         if not toolbar or request.is_ajax():
             return response
@@ -135,9 +136,9 @@ def process_response(self, request, response):
             for panel in toolbar.panels:
                 panel.process_response(request, response)
             response.content = replace_insensitive(
-                smart_unicode(response.content),
+                smart_text(response.content),
                 self.tag,
-                smart_unicode(toolbar.render_toolbar() + self.tag))
+                smart_text(toolbar.render_toolbar() + self.tag))
             if response.get('Content-Length', None):
                 response['Content-Length'] = len(response.content)
         del self.__class__.debug_toolbars[ident]

debug_toolbar/panels/cache.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import inspect
 import sys
 import time
@@ -10,6 +11,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,
@@ -59,7 +61,7 @@ def __init__(self, cache):
         self.cache = cache
 
     def __repr__(self):
-        return u"<CacheStatTracker for %s>" % self.cache.__repr__()
+        return "<CacheStatTracker for %s>" % self.cache.__repr__()
 
     def _get_func_info(self):
         frame = sys._getframe(3)
@@ -166,7 +168,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,7 @@
+from __future__ import unicode_literals
 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 +25,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 +82,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:
@@ -155,12 +157,12 @@ def title(self):
         return _('Profiling')
 
     def _unwrap_closure_and_profile(self, func):
-        if not hasattr(func, 'func_code'):
+        if not hasattr(func, '__code__'):
             return
         self.line_profiler.add_function(func)
-        if func.func_closure:
-            for cell in func.func_closure:
-                if hasattr(cell.cell_contents, 'func_code'):
+        if func.__closure__:
+            for cell in func.__closure__:
+                if hasattr(cell.cell_contents, '__code__'):
                     self._unwrap_closure_and_profile(cell.cell_contents)
 
     def process_view(self, request, view_func, view_args, view_kwargs):

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

@@ -1,21 +1,22 @@
+import re
 import uuid
-from copy import copy
+import sqlparse
 
 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.forms import SQLSelectForm
 from debug_toolbar.utils.compat.db import connections
 from debug_toolbar.middleware import DebugToolbarMiddleware
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils import render_stacktrace
-from debug_toolbar.utils.sql import reformat_sql
 from debug_toolbar.utils.tracking.db import CursorWrapper
-from debug_toolbar.utils.tracking import replace_call
+from debug_toolbar.utils.tracking import monkey_patch_call
 
 
 # Inject our tracking cursor
-@replace_call(BaseDatabaseWrapper.cursor)
+@monkey_patch_call(BaseDatabaseWrapper, 'cursor')
 def cursor(func, self):
     result = func(self)
 
@@ -26,6 +27,8 @@ def cursor(func, self):
 
     return CursorWrapper(result, self, logger=logger)
 
+BaseDatabaseWrapper.cursor = cursor
+
 
 def get_isolation_level_display(engine, level):
     if engine == 'psycopg2':
@@ -77,11 +80,9 @@ def __init__(self, *args, **kwargs):
         self._transaction_ids = {}
 
     def get_transaction_id(self, alias):
-        if alias not in connections:
-            return
         conn = connections[alias].connection
         if not conn:
-            return
+            return None
 
         engine = conn.__class__.__module__.split('.', 1)[0]
         if engine == 'psycopg2':
@@ -137,7 +138,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
@@ -173,9 +174,6 @@ def process_response(self, request, response):
                     query['iso_level'] = get_isolation_level_display(query['engine'], query['iso_level'])
                 if 'trans_status' in query:
                     query['trans_status'] = get_transaction_status_display(query['engine'], query['trans_status'])
-
-                query['form'] = SQLSelectForm(auto_id=None, initial=copy(query))
-
                 if query['sql']:
                     query['sql'] = reformat_sql(query['sql'])
                 query['rgb_color'] = self._databases[alias]['rgb_color']
@@ -199,3 +197,28 @@ def process_response(self, request, response):
             'queries': [q for a, q in self._queries],
             'sql_time': self._sql_time,
         })
+
+
+class BoldKeywordFilter():
+    """sqlparse filter to bold SQL keywords"""
+    def process(self, stack, stream):
+        """Process the token stream"""
+        for token_type, value in stream:
+            is_keyword = token_type in sqlparse.tokens.Keyword
+            if is_keyword:
+                yield sqlparse.tokens.Text, '<strong>'
+            yield token_type, escape(value)
+            if is_keyword:
+                yield sqlparse.tokens.Text, '</strong>'
+
+
+def swap_fields(sql):
+    return re.sub('SELECT</strong> (.*?) <strong>FROM', 'SELECT</strong> <a class="djDebugUncollapsed djDebugToggle" href="#">&bull;&bull;&bull;</a> ' +
+        '<a class="djDebugCollapsed djDebugToggle" href="#">\g<1></a> <strong>FROM', sql)
+
+
+def reformat_sql(sql):
+    stack = sqlparse.engine.FilterStack()
+    stack.preprocess.append(BoldKeywordFilter())  # add our custom filter
+    stack.postprocess.append(sqlparse.filters.SerializerUnicode())  # tokens -> strings
+    return swap_fields(''.join(stack.run(sql)))

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>

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>