Skip to content

Commit 539badf

Browse files
der-gabepigletto
authored andcommitted
Merged in der_gabe/django-datatables-view/cleanup (pull request #22)
Cleanup: remove unnecessary try-except-block
2 parents 7a1d025 + 340a2ec commit 539badf

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

django_datatables_view/mixins.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,16 @@ def get(self, request, *args, **kwargs):
4747
self.request = request
4848
response = None
4949

50-
try:
51-
func_val = self.get_context_data(**kwargs)
52-
if not self.is_clean:
53-
assert isinstance(func_val, dict)
54-
response = dict(func_val)
55-
if 'error' not in response and 'sError' not in response:
56-
response['result'] = 'ok'
57-
else:
58-
response['result'] = 'error'
50+
func_val = self.get_context_data(**kwargs)
51+
if not self.is_clean:
52+
assert isinstance(func_val, dict)
53+
response = dict(func_val)
54+
if 'error' not in response and 'sError' not in response:
55+
response['result'] = 'ok'
5956
else:
60-
response = func_val
61-
except KeyboardInterrupt:
62-
# Allow keyboard interrupts through for debugging.
63-
raise
57+
response['result'] = 'error'
58+
else:
59+
response = func_val
6460

6561
dump = json.dumps(response, cls=LazyEncoder)
6662
return self.render_to_response(dump)

0 commit comments

Comments
 (0)