aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbkonkle2011-09-12 11:38:46 -0500
committerbkonkle2011-09-12 11:38:46 -0500
commit48dca6e339b6e22de0ae2a570c0c71ff98831886 (patch)
treec661c9c35bf1b488aa92d9d9ec1062458325b69e
parentd9e9d8bbddb9986db79047a40194232f1baadf50 (diff)
downloaddjango-debug-toolbar-48dca6e339b6e22de0ae2a570c0c71ff98831886.tar.bz2
Cleaned up whitespace in the SQL and cache panels
-rw-r--r--debug_toolbar/panels/cache.py24
-rw-r--r--debug_toolbar/panels/sql.py50
2 files changed, 37 insertions, 37 deletions
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index bbfed66..ad3f844 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -13,7 +13,7 @@ class CacheStatTracker(BaseCache):
def __init__(self, cache):
self.cache = cache
self.reset()
-
+
def reset(self):
self.calls = []
self.hits = 0
@@ -23,11 +23,11 @@ class CacheStatTracker(BaseCache):
self.get_many = 0
self.deletes = 0
self.total_time = 0
-
+
def _get_func_info(self):
stack = inspect.stack()[2]
return (stack[1], stack[2], stack[3], stack[4])
-
+
def get(self, key, default=None):
t = time.time()
value = self.cache.get(key, default)
@@ -40,7 +40,7 @@ class CacheStatTracker(BaseCache):
self.gets += 1
self.calls.append((this_time, 'get', (key,), self._get_func_info()))
return value
-
+
def set(self, key, value, timeout=None):
t = time.time()
self.cache.set(key, value, timeout)
@@ -48,7 +48,7 @@ class CacheStatTracker(BaseCache):
self.total_time += this_time * 1000
self.sets += 1
self.calls.append((this_time, 'set', (key, value, timeout), self._get_func_info()))
-
+
def delete(self, key):
t = time.time()
self.cache.delete(key)
@@ -56,7 +56,7 @@ class CacheStatTracker(BaseCache):
self.total_time += this_time * 1000
self.deletes += 1
self.calls.append((this_time, 'delete', (key,), self._get_func_info()))
-
+
def get_many(self, keys):
t = time.time()
results = self.cache.get_many(keys)
@@ -76,7 +76,7 @@ class CacheDebugPanel(DebugPanel):
"""
name = 'Cache'
has_content = True
-
+
def __init__(self, *args, **kwargs):
super(self.__class__, self).__init__(*args, **kwargs)
# This is hackish but to prevent threading issues is somewhat needed
@@ -86,16 +86,16 @@ class CacheDebugPanel(DebugPanel):
else:
self.cache = CacheStatTracker(cache.cache)
cache.cache = self.cache
-
+
def nav_title(self):
return _('Cache: %.2fms') % self.cache.total_time
-
+
def title(self):
return _('Cache Usage')
-
+
def url(self):
return ''
-
+
def process_response(self, request, response):
self.stats = {
'cache_calls': len(self.cache.calls),
@@ -104,7 +104,7 @@ class CacheDebugPanel(DebugPanel):
}
toolbar = DebugToolbarMiddleware.get_current()
toolbar.stats['cache'] = self.stats
-
+
def content(self):
context = self.context.copy()
context.update(self.stats)
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 2c36336..9527410 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -18,12 +18,12 @@ from debug_toolbar.utils.tracking import replace_call
@replace_call(BaseDatabaseWrapper.cursor)
def cursor(func, self):
result = func(self)
-
+
djdt = DebugToolbarMiddleware.get_current()
if not djdt:
return result
logger = djdt.get_panel(SQLDebugPanel)
-
+
return CursorWrapper(result, self, logger=logger)
def get_isolation_level_display(engine, level):
@@ -38,7 +38,7 @@ def get_isolation_level_display(engine, level):
}
else:
raise ValueError(engine)
-
+
return choices.get(level)
def get_transaction_status_display(engine, level):
@@ -53,7 +53,7 @@ def get_transaction_status_display(engine, level):
}
else:
raise ValueError(engine)
-
+
return choices.get(level)
class SQLDebugPanel(DebugPanel):
@@ -63,7 +63,7 @@ class SQLDebugPanel(DebugPanel):
"""
name = 'SQL'
has_content = True
-
+
def __init__(self, *args, **kwargs):
super(self.__class__, self).__init__(*args, **kwargs)
self._offset = dict((k, len(connections[k].queries)) for k in connections)
@@ -73,33 +73,33 @@ class SQLDebugPanel(DebugPanel):
self._databases = {}
self._transaction_status = {}
self._transaction_ids = {}
-
+
def get_transaction_id(self, alias):
conn = connections[alias].connection
if not conn:
return None
-
+
engine = conn.__class__.__module__.split('.', 1)[0]
if engine == 'psycopg2':
cur_status = conn.get_transaction_status()
else:
raise ValueError(engine)
-
+
last_status = self._transaction_status.get(alias)
self._transaction_status[alias] = cur_status
-
+
if not cur_status:
# No available state
return None
-
+
if cur_status != last_status:
if cur_status:
self._transaction_ids[alias] = uuid.uuid4().hex
else:
self._transaction_ids[alias] = None
-
+
return self._transaction_ids[alias]
-
+
def record(self, alias, **kwargs):
self._queries.append((alias, kwargs))
if alias not in self._databases:
@@ -112,10 +112,10 @@ class SQLDebugPanel(DebugPanel):
self._databases[alias]['num_queries'] += 1
self._sql_time += kwargs['duration']
self._num_queries += 1
-
+
def nav_title(self):
return _('SQL')
-
+
def nav_subtitle(self):
# TODO l10n: use ngettext
return "%d %s in %.2fms" % (
@@ -123,17 +123,17 @@ class SQLDebugPanel(DebugPanel):
(self._num_queries == 1) and 'query' or 'queries',
self._sql_time
)
-
+
def title(self):
count = len(self._databases)
-
+
return __('SQL Queries from %(count)d connection', 'SQL Queries from %(count)d connections', count) % dict(
count=count,
)
-
+
def url(self):
return ''
-
+
def process_response(self, request, response):
if self._queries:
width_ratio_tally = 0
@@ -157,14 +157,14 @@ class SQLDebugPanel(DebugPanel):
nn = 0
rgb[nn] = nc
db['rgb_color'] = rgb
-
+
trans_ids = {}
trans_id = None
i = 0
for alias, query in self._queries:
trans_id = query.get('trans_id')
last_trans_id = trans_ids.get(alias)
-
+
if trans_id != last_trans_id:
if last_trans_id:
self._queries[i-1][1]['ends_trans'] = True
@@ -173,7 +173,7 @@ class SQLDebugPanel(DebugPanel):
query['starts_trans'] = True
if trans_id:
query['in_trans'] = True
-
+
query['alias'] = alias
if 'iso_level' in query:
query['iso_level'] = get_isolation_level_display(query['engine'], query['iso_level'])
@@ -190,7 +190,7 @@ class SQLDebugPanel(DebugPanel):
query['start_offset'] = width_ratio_tally
query['end_offset'] = query['width_ratio'] + query['start_offset']
width_ratio_tally += query['width_ratio']
-
+
stacktrace = []
for frame in query['stacktrace']:
params = map(escape, frame[0].rsplit('/', 1) + list(frame[1:]))
@@ -201,10 +201,10 @@ class SQLDebugPanel(DebugPanel):
continue
query['stacktrace'] = mark_safe('\n'.join(stacktrace))
i += 1
-
+
if trans_id:
self._queries[i-1][1]['ends_trans'] = True
-
+
self.stats = {
'databases': sorted(self._databases.items(), key=lambda x: -x[1]['time_spent']),
'queries': [q for a, q in self._queries],
@@ -212,7 +212,7 @@ class SQLDebugPanel(DebugPanel):
}
toolbar = DebugToolbarMiddleware.get_current()
toolbar.stats['sql'] = self.stats
-
+
def content(self):
context = self.context.copy()
context.update(self.stats)