Move unquote_plus import to compat.py

Author: lucacorti

oauth2_provider/compat.py

@@ -15,9 +15,9 @@
     from urllib.parse import urlparse, parse_qs, urlunparse
 
 try:
-    from urllib import urlencode
+    from urllib import urlencode, unquote_plus
 except ImportError:
-    from urllib.parse import urlencode
+    from urllib.parse import urlencode, unquote_plus
 
 # Django 1.5 add support for custom auth user model
 if django.VERSION >= (1, 5):

oauth2_provider/oauth2_validators.py

@@ -1,17 +1,14 @@
 from __future__ import unicode_literals
 
 import base64
-try:
-	from urllib.parse import unquote_plus
-except ImportError:
-	from urllib import unquote_plus
 import logging
 from datetime import timedelta
 
 from django.utils import timezone
 from django.contrib.auth import authenticate
 from oauthlib.oauth2 import RequestValidator
 
+from .compat import unquote_plus
 from .models import Grant, AccessToken, RefreshToken, get_application_model
 from .settings import oauth2_settings