aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.py
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework/compat.py')
-rw-r--r--rest_framework/compat.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 91723b45..c58aa4ce 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -10,6 +10,7 @@ import inspect
from django.core.exceptions import ImproperlyConfigured
from django.utils.encoding import force_text
+from django.utils.six.moves.urllib import parse as urlparse
from django.conf import settings
from django.utils import six
import django
@@ -60,13 +61,6 @@ if 'guardian' in settings.INSTALLED_APPS:
pass
-# urlparse compat import (Required because it changed in python 3.x)
-try:
- from urllib import parse as urlparse
-except ImportError:
- import urlparse
-
-
# UserDict moves in Python 3
try:
from UserDict import UserDict