diff options
| author | Tom Christie | 2015-01-08 14:16:58 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-08 14:16:58 +0000 | 
| commit | b33a6cbff16e5a28a1a696e2ac617303da181720 (patch) | |
| tree | 68dd517e4653a8c41bc01827896f2bb382b193ba /rest_framework/compat.py | |
| parent | 3dbcefb3c75877fb210e7e04037e682c718a4c6e (diff) | |
| download | django-rest-framework-b33a6cbff16e5a28a1a696e2ac617303da181720.tar.bz2 | |
Ensure urlparse is not publically exposed in compat.py - less chance of accidental conflict.
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b1f6f2fa..971dee9c 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -10,7 +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.utils.six.moves.urllib.parse import urlparse as _urlparse  from django.conf import settings  from django.utils import six  import django @@ -182,7 +182,7 @@ except ImportError:  class RequestFactory(DjangoRequestFactory):      def generic(self, method, path,              data='', content_type='application/octet-stream', **extra): -        parsed = urlparse.urlparse(path) +        parsed = _urlparse(path)          data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)          r = {              'PATH_INFO': self._get_path(parsed), | 
