aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/renderers.py
diff options
context:
space:
mode:
authorTom Christie2013-02-06 05:21:01 -0800
committerTom Christie2013-02-06 05:21:01 -0800
commit123c6cbc7cebf797ed0b310a5a8d398fa6323ce4 (patch)
tree79d8108c64560cea6de4dad198ea7e28f64d682e /rest_framework/renderers.py
parent55fd64663167ce4447565ecba7170f8eccc1fdf0 (diff)
parent11610e7c3c4330b863c9da5d843b6d874c2958e9 (diff)
downloaddjango-rest-framework-123c6cbc7cebf797ed0b310a5a8d398fa6323ce4.tar.bz2
Merge pull request #640 from mjtamlyn/remove-naked-excepts
Purge naked excepts.
Diffstat (limited to 'rest_framework/renderers.py')
-rw-r--r--rest_framework/renderers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 74c7e2c9..960d4849 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -217,7 +217,7 @@ class TemplateHTMLRenderer(BaseRenderer):
try:
# Try to find an appropriate error template
return self.resolve_template(template_names)
- except:
+ except Exception:
# Fall back to using eg '404 Not Found'
return Template('%d %s' % (response.status_code,
response.status_text.title()))
@@ -303,7 +303,7 @@ class BrowsableAPIRenderer(BaseRenderer):
try:
if not view.has_permission(request, obj):
return # Don't have permission
- except:
+ except Exception:
return # Don't have permission and exception explicitly raise
return True