Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compat: (py2) urlparse = urllib.parse (py3) #6262

Merged
merged 2 commits into from Jan 8, 2019
Merged

compat: (py2) urlparse = urllib.parse (py3) #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1719c7
compat: (py2) urlparse = urllib.parse (py3)
stephenfin Oct 20, 2018
3dce914
compat: Remove 'compat.urlparse'
stephenfin Oct 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions rest_framework/compat.py
View file
Open in desktop
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion rest_framework/renderers.py
View file
Open in desktop
Expand Up @@ -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
Expand Down