misc: remove usage of django.utils.six (#63686)

tests/test_source_phone.py

@@ -20,7 +20,6 @@ import re
 import pytest
 from django.test import override_settings
 from django.urls import reverse
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.timezone import now, timedelta
 

welco/sources/mail/maarch.py

@@ -15,11 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
+import urllib.parse
 
 import requests
 from dateutil.parser import parse as parse_datetime
-from django.utils import six
-from django.utils.six.moves.urllib import parse as urlparse
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 
@@ -152,19 +151,19 @@ class MaarchCourrier:
 
     @property
     def list_url(self):
-        return urlparse.urljoin(self.url, 'rest/res/list')
+        return urllib.parse.urljoin(self.url, 'rest/res/list')
 
     @property
     def update_external_infos_url(self):
-        return urlparse.urljoin(self.url, 'rest/res/externalInfos')
+        return urllib.parse.urljoin(self.url, 'rest/res/externalInfos')
 
     @property
     def update_status_url(self):
-        return urlparse.urljoin(self.url, 'rest/res/resource/status')
+        return urllib.parse.urljoin(self.url, 'rest/res/resource/status')
 
     @property
     def post_courrier_url(self):
-        return urlparse.urljoin(self.url, 'rest/res')
+        return urllib.parse.urljoin(self.url, 'rest/res')
 
     def get_courriers(self, clause, fields=None, limit=None, include_file=False, order_by=None):
         if fields:

welco/sources/phone/views.py

@@ -23,7 +23,6 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.template import RequestContext
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.timezone import now
 from django.views.decorators.csrf import csrf_exempt

welco/utils.py

@@ -21,6 +21,7 @@ import hmac
 import json
 import random
 import re
+import urllib.parse
 
 import requests
 from django.conf import settings
@@ -28,13 +29,12 @@ from django.core.cache import cache
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.utils.encoding import smart_bytes
 from django.utils.http import quote, urlencode
-from django.utils.six.moves.urllib import parse as urlparse
 
 
 def sign_url(url, key, algo='sha256', timestamp=None, nonce=None):
-    parsed = urlparse.urlparse(url)
+    parsed = urllib.parse.urlparse(url)
     new_query = sign_query(parsed.query, key, algo, timestamp, nonce)
-    return urlparse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
+    return urllib.parse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
 
 
 def sign_query(query, key, algo='sha256', timestamp=None, nonce=None):