From c052a86c7b8ebc8159582dafaea3f6cf4a8c40f5 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 8 Jan 2019 13:03:02 +0100 Subject: [PATCH] compat: (py2) urlparse = urllib.parse (py3) (#6262) * compat: (py2) urlparse = urllib.parse (py3) We were mistakenly importing the 'urlparse' function from the Python 2 'urlparse' module, as opposed to the module itself. Correct this. Signed-off-by: Stephen Finucane Closes: #6261 * compat: Remove 'compat.urlparse' We can just use Django's vendored six library, like we do everywhere else. Signed-off-by: Stephen Finucane --- rest_framework/compat.py | 7 ------- rest_framework/renderers.py | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 1d34828bd..fffc17938 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,13 +17,6 @@ except ImportError: # Python 2.7 from collections import Mapping # noqa -try: - # Python 3 - import urllib.parse as urlparse # noqa -except ImportError: - # Python 2.7 - from urlparse import urlparse # noqa - try: from django.urls import ( # noqa URLPattern, diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 9563cd1de..f043e6327 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -21,11 +21,12 @@ from django.test.client import encode_multipart from django.urls import NoReverseMatch from django.utils import six from django.utils.html import mark_safe +from django.utils.six.moves.urllib import parse as urlparse from rest_framework import VERSION, exceptions, serializers, status from rest_framework.compat import ( INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, coreapi, coreschema, - pygments_css, urlparse, yaml + pygments_css, yaml ) from rest_framework.exceptions import ParseError from rest_framework.request import is_form_media_type, override_method