aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.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/compat.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/compat.py')
-rw-r--r--rest_framework/compat.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 0d512342..9636b9c1 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -10,13 +10,13 @@ import django
# Try to import six from Django, fallback to included `six`.
try:
from django.utils import six
-except:
+except ImportError:
from rest_framework import six
# location of patterns, url, include changes in 1.4 onwards
try:
from django.conf.urls import patterns, url, include
-except:
+except ImportError:
from django.conf.urls.defaults import patterns, url, include
# Handle django.utils.encoding rename:
@@ -35,7 +35,7 @@ except ImportError:
# django-filter is optional
try:
import django_filters
-except:
+except ImportError:
django_filters = None