the tyranny of pep 8

This commit is contained in:
Andy McKay 2014-09-17 16:06:44 -07:00
parent 4982aeb716
commit f8c8a13754
6 changed files with 27 additions and 18 deletions

View File

@ -1,8 +1,10 @@
from django.http import Http404
from django_statsd.clients import statsd
import inspect
import time
from django.http import Http404
from django_statsd.clients import statsd
class GraphiteMiddleware(object):
@ -59,5 +61,5 @@ class TastyPieRequestTimingMiddleware(GraphiteRequestTimingMiddleware):
request._view_name = view_kwargs['resource_name']
request._start_time = time.time()
except (AttributeError, KeyError):
super(TastyPieRequestTimingMiddleware, self).process_view(request,
view_func, view_args, view_kwargs)
super(TastyPieRequestTimingMiddleware, self).process_view(
request, view_func, view_args, view_kwargs)

View File

@ -1,5 +1,6 @@
import django
from django.db.backends import util
from django_statsd.patches.utils import wrap, patch_method
from django_statsd.clients import statsd

View File

@ -1,6 +1,7 @@
from django_statsd.clients import statsd
from functools import partial, wraps
def patch_method(target, name, external_decorator=None):
def decorator(patch_function):
@ -15,6 +16,7 @@ def patch_method(target, name, external_decorator=None):
return decorator
def wrapped(method, key, *args, **kw):
with statsd.timer(key):
return method(*args, **kw)

View File

@ -108,8 +108,10 @@ class TestTiming(unittest.TestCase):
def test_request_timing_tastypie(self, timing):
func = lambda x: x
gmw = middleware.TastyPieRequestTimingMiddleware()
gmw.process_view(self.req, func, tuple(), {'api_name': 'my_api_name',
'resource_name': 'my_resource_name'})
gmw.process_view(self.req, func, tuple(), {
'api_name': 'my_api_name',
'resource_name': 'my_resource_name'
})
gmw.process_response(self.req, self.res)
eq_(timing.call_count, 3)
names = ['view.my_api_name.my_resource_name.GET',

View File

@ -3,7 +3,8 @@ try:
except ImportError: # django < 1.4
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('',
url('^record$', 'django_statsd.views.record',
name='django_statsd.record'),
urlpatterns = patterns(
'',
url('^record$', 'django_statsd.views.record', name='django_statsd.record'),
)

View File

@ -65,12 +65,12 @@ def process_key(start, key, value):
def _process_summaries(start, keys):
calculated = {
'network': keys['window.performance.timing.responseStart'] - start,
'app': keys['window.performance.timing.domLoading'] -
keys['window.performance.timing.responseStart'],
'dom': keys['window.performance.timing.domComplete'] -
keys['window.performance.timing.domLoading'],
'rendering': keys['window.performance.timing.loadEventEnd'] -
keys['window.performance.timing.domComplete'],
'app': (keys['window.performance.timing.domLoading'] -
keys['window.performance.timing.responseStart']),
'dom': (keys['window.performance.timing.domComplete'] -
keys['window.performance.timing.domLoading']),
'rendering': (keys['window.performance.timing.loadEventEnd'] -
keys['window.performance.timing.domComplete']),
}
for k, v in list(calculated.items()):
# If loadEventEnd still does not get populated, we could end up with
@ -81,7 +81,8 @@ def _process_summaries(start, keys):
@require_http_methods(['GET', 'HEAD'])
def _process_boomerang(request):
if 'nt_nav_st' not in request.GET:
raise ValueError('nt_nav_st not in request.GET, make sure boomerang'
raise ValueError(
'nt_nav_st not in request.GET, make sure boomerang'
' is made with navigation API timings as per the following'
' http://yahoo.github.com/boomerang/doc/howtos/howto-9.html')
@ -128,8 +129,8 @@ def _process_stick(request):
clients = {
'boomerang': _process_boomerang,
'stick': _process_stick,
'boomerang': _process_boomerang,
'stick': _process_stick,
}