diff options
| author | Tymur Maryokhin | 2014-12-04 15:47:42 +0100 | 
|---|---|---|
| committer | Tymur Maryokhin | 2014-12-04 15:47:42 +0100 | 
| commit | 95af92ca01435c32f4374d26eb448f964d77c81a (patch) | |
| tree | 7d2711f462f3c451d1afd779505c36d7020b2686 /rest_framework/compat.py | |
| parent | d54c67d79d0f5661ef33d860efe80a4272e22b3e (diff) | |
| download | django-rest-framework-95af92ca01435c32f4374d26eb448f964d77c81a.tar.bz2 | |
Removed custom urlparse compat
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 8 | 
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 | 
