Move urlsplit / urlunsplit import to compat

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

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