Bump version to 0.6.3.1 to re-release with changelog info

Use the "flask.ext" import for compatibility with old and new versions

CHANGES.rst

@@ -1,6 +1,19 @@
 Changes
 =======
 
+0.6.3.1 (2012-04-16)
+------------------
+
+New release to add missing changelog for 0.6.3
+
+
+0.6.3 (2012-04-16)
+------------------
+Fixes:
+
+- Compatibility with Flask-SQLAlchemy 0.16 package name
+
+
 0.6.2 (2012-02-18)
 ------------------
 

flask_debugtoolbar/panels/sqlalchemy.py

@@ -1,7 +1,7 @@
 import hashlib
 
 try:
-    from flaskext.sqlalchemy import get_debug_queries, SQLAlchemy
+    from flask.ext.sqlalchemy import get_debug_queries, SQLAlchemy
 except ImportError:
     sqlalchemy_available = False
     get_debug_queries = SQLAlchemy = None

flask_debugtoolbar/templates/panels/headers.html

@@ -7,7 +7,7 @@
 	</thead>
 	<tbody>
 		{% for key, value in headers.iteritems() %}
-			<tr class="{{ loop.cycle('djDebugOdd' 'djDebugEven') }}">
+			<tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
 				<td>{{ key|escape }}</td>
 				<td>{{ value|escape }}</td>
 			</tr>

flask_debugtoolbar/templates/panels/logger.html

@@ -10,7 +10,7 @@
 		</thead>
 		<tbody>
 			{% for record in records %}
-				<tr class="{{ loop.cycle('fjDebugOdd' 'fjDebugEven') }}">
+				<tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
 					<td>{{ record.level }}</td>
 					<td>{{ record.time }}</td>
 					<td>{{ record.message }}</td>

flask_debugtoolbar/templates/panels/profiler.html

@@ -11,7 +11,7 @@
 	</thead>
 	<tbody>
         {% for row in function_calls %}
-			<tr class="{{ loop.cycle('flDebugOdd' 'flDebugEven') }}">
+			<tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
 				<td>{{ row.ncalls }}</td>
 				<td>{{ row.tottime }}</td>
 				<td>{{ '%.4f'|format(row.percall) }}</td>

flask_debugtoolbar/templates/panels/request_vars.html

@@ -39,7 +39,7 @@
         </thead>
         <tbody>
             {% for key, value in map %}
-                <tr class="{{ loop.cycle('flDebugOdd' 'flDebugEven') }}">
+                <tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
                     <td>{{ key|printable }}</td>
                     <td>{{ value|printable }}</td>
                 </tr>
@@ -74,7 +74,7 @@
         </thead>
         <tbody>
             {% for key, value in map %}
-                <tr class="{{ loop.cycle('flDebugOdd' 'flDebugEven') }}">
+                <tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
                     <td>{{ key|printable }}</td>
                     <td>
                       {%- set sep = joiner() -%}

flask_debugtoolbar/templates/panels/sqlalchemy.html

@@ -9,7 +9,7 @@
 	</thead>
 	<tbody>
 		{% for query in queries %}
-			<tr class="{{ loop.cycle('flDebugOdd' 'flDebugEven') }}">
+			<tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
 				<td>{{ '%.4f'|format(query.duration) }}</td>
 				<td>
 				{% if query.params %}
@@ -26,7 +26,7 @@
                     {{ query.context }}
 				</td>
 				<td class="syntax">
-					<div class="djDebugSqlWrap">
+					<div class="flDebugSqlWrap">
 						<div class="flDebugSql">{{ query.sql|safe }}</div>
                         {#
 						{% if query.stacktrace %}

flask_debugtoolbar/templates/panels/sqlalchemy_explain.html

@@ -10,7 +10,7 @@
 			<dt>Time</dt>
 			<dd>{{ '%.4f'|format(duration) }} ms</dd>
 		</dl>
-		<table class="djSqlExplain">
+		<table class="flSqlExplain">
 			<thead>
 				<tr>
 					{% for h in headers %}
@@ -20,7 +20,7 @@
 			</thead>
 			<tbody>
 				{% for row in result %}
-				    <tr class="{{ loop.cycle('fjDebugOdd' 'fjDebugEven') }}">
+				    <tr class="{{ loop.cycle('fjDebugOdd', 'fjDebugEven') }}">
 						{% for column in row %}
 							<td>{{ column }}</td>
 						{% endfor %}

flask_debugtoolbar/templates/panels/sqlalchemy_select.html

@@ -21,7 +21,7 @@
 			</thead>
 			<tbody>
 				{% for row in result %}
-				    <tr class="{{ loop.cycle('fjDebugOdd' 'fjDebugEven') }}">
+				    <tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
 						{% for column in row %}
 							<td>{{ column }}</td>
 						{% endfor %}

flask_debugtoolbar/templates/panels/template.html

@@ -1,22 +1,23 @@
 {% if templates %}
-	<table>
-		<thead>
-			<tr>
-				<th>Filename</th>
-				<th>Context vars</th>
-			</tr>
-		</thead>
-		<tbody>
-			{% for template in templates %}
-				<tr class="{{ loop.cycle('fjDebugOdd' 'fjDebugEven') }}">
-					<td>{{ template.template.name }}</td>
-					<td>{{ template.context.keys()|join(', ') }}</td>
-				</tr>
-			{% endfor %}
-		</tbody>
-	</table>
+    {% for template in templates %}
+        <h4>{{ template.template.name }}</h4>
+        <table>
+            <thead>
+            <tr>
+                <th>Variable</th>
+                <th>Value</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for k, v in template.context|dictsort %}
+                <tr class="{{ loop.cycle('flDebugOdd', 'flDebugEven') }}">
+                    <td>{{ k }}</td>
+                    <td>{{ v|printable }}</td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    {% endfor %}
 {% else %}
-	<p>No templates rendered.</p>
+    <p>No template rendered</p>
 {% endif %}
-
-

flask_debugtoolbar/toolbar.py

@@ -1,3 +1,5 @@
+import urllib
+
 from flask import url_for, current_app
 
 
@@ -52,7 +54,8 @@ class DebugToolbar(object):
         """
         Populate debug panels
         """
-        activated = self.request.cookies.get('fldt_active', '').split(';')
+        activated = self.request.cookies.get('fldt_active', '')
+        activated = urllib.unquote(activated).split(';')
 
         for panel_class in self.panel_classes:
             panel_instance = panel_class(

setup.py

@@ -14,7 +14,7 @@ except:
 
 setup(
     name='Flask-DebugToolbar',
-    version='0.6.2',
+    version='0.6.3.1',
     url='http://github.com/mgood/flask-debugtoolbar',
     license='BSD',
     author='Michael van Tellingen',