Skip to content

Commit 01cd085

Browse files
committed
pep8
1 parent c4eeef2 commit 01cd085

24 files changed

+203
-177
lines changed

debug_toolbar/middleware.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import thread
66

77
from django.conf import settings
8-
from django.conf.urls.defaults import include, patterns
98
from django.http import HttpResponseRedirect
109
from django.shortcuts import render_to_response
1110
from django.utils.encoding import smart_unicode
@@ -16,6 +15,7 @@
1615

1716
_HTML_TYPES = ('text/html', 'application/xhtml+xml')
1817

18+
1919
def replace_insensitive(string, target, replacement):
2020
"""
2121
Similar to string.replace() but is case insensitive
@@ -25,9 +25,10 @@ def replace_insensitive(string, target, replacement):
2525
index = no_case.rfind(target.lower())
2626
if index >= 0:
2727
return string[:index] + replacement + string[index + len(target):]
28-
else: # no results so return the original string
28+
else: # no results so return the original string
2929
return string
3030

31+
3132
class DebugToolbarMiddleware(object):
3233
"""
3334
Middleware to set up Debug Toolbar on incoming request and render toolbar
@@ -43,10 +44,10 @@ def __init__(self):
4344
self._urlconfs = {}
4445

4546
# Set method to use to decide to show toolbar
46-
self.show_toolbar = self._show_toolbar # default
47+
self.show_toolbar = self._show_toolbar # default
4748

4849
# The tag to attach the toolbar to
49-
self.tag= u'</body>'
50+
self.tag = u'</body>'
5051

5152
if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'):
5253
show_toolbar_callback = settings.DEBUG_TOOLBAR_CONFIG.get(

debug_toolbar/panels/__init__.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,59 @@ class DebugPanel(object):
99
"""
1010
# name = 'Base'
1111
# template = 'debug_toolbar/panels/base.html'
12-
has_content = False # If content returns something, set to true in subclass
13-
12+
has_content = False # If content returns something, set to true in subclass
13+
1414
# We'll maintain a local context instance so we can expose our template
1515
# context variables to panels which need them:
1616
context = {}
17-
17+
1818
# Panel methods
1919
def __init__(self, context={}):
2020
self.context.update(context)
2121
self.slug = slugify(self.name)
22-
22+
2323
def dom_id(self):
2424
return 'djDebug%sPanel' % (self.name.replace(' ', ''))
25-
25+
2626
def nav_title(self):
2727
"""Title showing in toolbar"""
2828
raise NotImplementedError
29-
29+
3030
def nav_subtitle(self):
3131
"""Subtitle showing until title in toolbar"""
3232
return ''
33-
33+
3434
def title(self):
3535
"""Title showing in panel"""
3636
raise NotImplementedError
37-
37+
3838
def url(self):
3939
raise NotImplementedError
40-
40+
4141
def content(self):
4242
if self.has_content:
4343
context = self.context.copy()
4444
context.update(self.get_stats())
4545
return render_to_string(self.template, context)
46-
46+
4747
def record_stats(self, stats):
4848
toolbar = DebugToolbarMiddleware.get_current()
4949
panel_stats = toolbar.stats.get(self.slug)
5050
if panel_stats:
5151
panel_stats.update(stats)
5252
else:
5353
toolbar.stats[self.slug] = stats
54-
54+
5555
def get_stats(self):
5656
toolbar = DebugToolbarMiddleware.get_current()
5757
return toolbar.stats.get(self.slug, {})
58-
58+
5959
# Standard middleware methods
6060
def process_request(self, request):
6161
pass
62-
62+
6363
def process_view(self, request, view_func, view_args, view_kwargs):
6464
pass
65-
65+
6666
def process_response(self, request, response):
6767
pass

debug_toolbar/panels/cache.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
from django.utils.translation import ugettext_lazy as _
77
from debug_toolbar.panels import DebugPanel
88

9+
910
class CacheStatTracker(BaseCache):
1011
"""A small class used to track cache calls."""
1112
def __init__(self, cache):
1213
self.cache = cache
1314
self.reset()
14-
15+
1516
def reset(self):
1617
self.calls = []
1718
self.hits = 0
@@ -21,11 +22,11 @@ def reset(self):
2122
self.get_many = 0
2223
self.deletes = 0
2324
self.total_time = 0
24-
25+
2526
def _get_func_info(self):
2627
stack = inspect.stack()[2]
2728
return (stack[1], stack[2], stack[3], stack[4])
28-
29+
2930
def get(self, key, default=None):
3031
t = time.time()
3132
value = self.cache.get(key, default)
@@ -38,23 +39,23 @@ def get(self, key, default=None):
3839
self.gets += 1
3940
self.calls.append((this_time, 'get', (key,), self._get_func_info()))
4041
return value
41-
42+
4243
def set(self, key, value, timeout=None):
4344
t = time.time()
4445
self.cache.set(key, value, timeout)
4546
this_time = time.time() - t
4647
self.total_time += this_time * 1000
4748
self.sets += 1
4849
self.calls.append((this_time, 'set', (key, value, timeout), self._get_func_info()))
49-
50+
5051
def delete(self, key):
5152
t = time.time()
5253
self.cache.delete(key)
5354
this_time = time.time() - t
5455
self.total_time += this_time * 1000
5556
self.deletes += 1
5657
self.calls.append((this_time, 'delete', (key,), self._get_func_info()))
57-
58+
5859
def get_many(self, keys):
5960
t = time.time()
6061
results = self.cache.get_many(keys)
@@ -68,14 +69,15 @@ def get_many(self, keys):
6869
self.hits += 1
6970
self.calls.append((this_time, 'get_many', (keys,), self._get_func_info()))
7071

72+
7173
class CacheDebugPanel(DebugPanel):
7274
"""
7375
Panel that displays the cache statistics.
7476
"""
7577
name = 'Cache'
7678
template = 'debug_toolbar/panels/cache.html'
7779
has_content = True
78-
80+
7981
def __init__(self, *args, **kwargs):
8082
super(CacheDebugPanel, self).__init__(*args, **kwargs)
8183
# This is hackish but to prevent threading issues is somewhat needed
@@ -85,16 +87,16 @@ def __init__(self, *args, **kwargs):
8587
else:
8688
self.cache = CacheStatTracker(cache.cache)
8789
cache.cache = self.cache
88-
90+
8991
def nav_title(self):
9092
return _('Cache: %.2fms') % self.cache.total_time
91-
93+
9294
def title(self):
9395
return _('Cache Usage')
94-
96+
9597
def url(self):
9698
return ''
97-
99+
98100
def process_response(self, request, response):
99101
self.record_stats({
100102
'cache_calls': len(self.cache.calls),

debug_toolbar/panels/headers.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ class HeaderDebugPanel(DebugPanel):
3232
'SERVER_PROTOCOL',
3333
'SERVER_SOFTWARE',
3434
)
35-
35+
3636
def nav_title(self):
3737
return _('HTTP Headers')
38-
38+
3939
def title(self):
4040
return _('HTTP Headers')
41-
41+
4242
def url(self):
4343
return ''
44-
44+
4545
def process_request(self, request):
4646
self.headers = dict(
4747
[(k, request.META[k]) for k in self.header_filter if k in request.META]
4848
)
49-
49+
5050
def process_response(self, request, response):
5151
self.record_stats({
5252
'headers': self.headers

debug_toolbar/panels/logger.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ def __init__(self):
1313
if threading is None:
1414
raise NotImplementedError("threading module is not available, \
1515
the logging panel cannot be used without it")
16-
self.records = {} # a dictionary that maps threads to log records
17-
16+
self.records = {} # a dictionary that maps threads to log records
17+
1818
def add_record(self, record, thread=None):
1919
# Avoid logging SQL queries since they are already in the SQL panel
2020
# TODO: Make this check whether SQL panel is enabled
2121
if record.get('channel', '') == 'django.db.backends':
2222
return
23-
23+
2424
self.get_records(thread).append(record)
25-
25+
2626
def get_records(self, thread=None):
2727
"""
2828
Returns a list of records for the provided thread, of if none is provided,
@@ -33,7 +33,7 @@ def get_records(self, thread=None):
3333
if thread not in self.records:
3434
self.records[thread] = []
3535
return self.records[thread]
36-
36+
3737
def clear_records(self, thread=None):
3838
if thread is None:
3939
thread = threading.currentThread()
@@ -45,7 +45,7 @@ class ThreadTrackingHandler(logging.Handler):
4545
def __init__(self, collector):
4646
logging.Handler.__init__(self)
4747
self.collector = collector
48-
48+
4949
def emit(self, record):
5050
record = {
5151
'message': record.getMessage(),
@@ -75,7 +75,7 @@ class LogbookThreadTrackingHandler(logbook.handlers.Handler):
7575
def __init__(self, collector):
7676
logbook.handlers.Handler.__init__(self, bubble=True)
7777
self.collector = collector
78-
78+
7979
def emit(self, record):
8080
record = {
8181
'message': record.message,
@@ -86,37 +86,37 @@ def emit(self, record):
8686
'channel': record.channel,
8787
}
8888
self.collector.add_record(record)
89-
90-
89+
9190
logbook_handler = LogbookThreadTrackingHandler(collector)
92-
logbook_handler.push_application() # register with logbook
91+
logbook_handler.push_application() # register with logbook
92+
9393

9494
class LoggingPanel(DebugPanel):
9595
name = 'Logging'
9696
template = 'debug_toolbar/panels/logger.html'
9797
has_content = True
98-
98+
9999
def process_request(self, request):
100100
collector.clear_records()
101-
101+
102102
def process_response(self, request, response):
103103
records = self.get_and_delete()
104104
self.record_stats({'records': records})
105-
105+
106106
def get_and_delete(self):
107107
records = collector.get_records()
108108
collector.clear_records()
109109
return records
110-
110+
111111
def nav_title(self):
112112
return _("Logging")
113-
113+
114114
def nav_subtitle(self):
115115
# FIXME l10n: use ngettext
116116
return "%s message%s" % (len(collector.get_records()), (len(collector.get_records()) == 1) and '' or 's')
117-
117+
118118
def title(self):
119119
return _('Log Messages')
120-
120+
121121
def url(self):
122122
return ''

0 commit comments

Comments
 (0)