From 0be0f259a3a6ce3da1f2f62341b0ead23a1ca8cf Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Wed, 15 Mar 2017 03:13:08 +0200 Subject: [PATCH] Move urlsplit / urlunsplit import to compat --- oauth2_provider/compat.py | 4 ++-- oauth2_provider/validators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oauth2_provider/compat.py b/oauth2_provider/compat.py index dd4914ab8..94d7e749a 100644 --- a/oauth2_provider/compat.py +++ b/oauth2_provider/compat.py @@ -7,9 +7,9 @@ # urlparse in python3 has been renamed to urllib.parse try: - from urlparse import urlparse, parse_qs, parse_qsl, urlunparse + from urlparse import parse_qs, parse_qsl, urlparse, urlsplit, urlunparse, urlunsplit except ImportError: - from urllib.parse import urlparse, parse_qs, parse_qsl, urlunparse + from urllib.parse import parse_qs, parse_qsl, urlparse, urlsplit, urlunsplit, urlunparse try: from urllib import urlencode, quote_plus, unquote_plus diff --git a/oauth2_provider/validators.py b/oauth2_provider/validators.py index d3fefc4dc..e3ece929c 100644 --- a/oauth2_provider/validators.py +++ b/oauth2_provider/validators.py @@ -5,9 +5,9 @@ from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.utils.encoding import force_text -from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit from django.utils.translation import ugettext_lazy as _ +from .compat import urlsplit, urlunsplit from .settings import oauth2_settings