equal
deleted
inserted
replaced
43 """ |
43 """ |
44 @wraps(func) |
44 @wraps(func) |
45 def view_wrapper(*args, **kwds): |
45 def view_wrapper(*args, **kwds): |
46 try: |
46 try: |
47 return func(*args, **kwds) |
47 return func(*args, **kwds) |
48 except DeadlineExceededError: |
48 except DeadlineExceededError, e: |
49 logging.exception('DeadlineExceededError') |
49 logging.exception(e) |
50 return http.HttpResponse('DeadlineExceededError') |
50 return http.HttpResponseRedirect('/soc/content/deadline_exceeded.html') |
51 except MemoryError: |
51 except MemoryError, e: |
52 logging.exception('MemoryError') |
52 logging.exception(e) |
53 return http.HttpResponse('MemoryError') |
53 return http.HttpResponseRedirect('/soc/content/memory_error.html') |
54 except AssertionError: |
54 except AssertionError, e: |
55 logging.exception('AssertionError') |
55 logging.exception(e) |
56 return http.HttpResponse('AssertionError') |
56 return http.HttpResponseRedirect('/soc/content/assertion_error.html') |
57 |
57 |
58 return view_wrapper |
58 return view_wrapper |
59 |
59 |
60 |
60 |
61 def merge_params(func): |
61 def merge_params(func): |