From 9b36ebae308bd05371fc327d140354fe13273a79 Mon Sep 17 00:00:00 2001 From: Martin Chaine Date: Mon, 19 Nov 2018 16:20:01 +0100 Subject: [PATCH] compat: (py2) urlparse = urllib.parse (py3) https://github.com/encode/django-rest-framework/pull/6262 --- 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 1d34828bdc..fffc179384 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,13 +17,6 @@ # 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 375c38a857..68d1413d1f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -21,11 +21,12 @@ 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