From 3f335c9bee7eaf8980e6732b2164d1b1d98d140a Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <ecazenave@entrouvert.com>
Date: Thu, 9 Jun 2022 17:10:20 +0200
Subject: [PATCH] django 3.2: import url related functions from urllib (#64430)

---
 docbow_project/docbow/auth_views.py                 | 6 ++++--
 docbow_project/docbow/forms.py                      | 2 +-
 docbow_project/docbow/models.py                     | 4 ++--
 docbow_project/docbow/profile_views.py              | 3 ++-
 docbow_project/docbow/sms_carrier_ovh.py            | 2 +-
 docbow_project/pfwb/management/commands/sendmail.py | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docbow_project/docbow/auth_views.py b/docbow_project/docbow/auth_views.py
index e6a8562..11be7ff 100644
--- a/docbow_project/docbow/auth_views.py
+++ b/docbow_project/docbow/auth_views.py
@@ -1,8 +1,10 @@
+import urllib.parse
+
 from django.conf import settings
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponseRedirect
 from django.shortcuts import resolve_url
-from django.utils.six.moves.urllib import parse as urllib
+
 
 if 'mellon' in settings.INSTALLED_APPS:
     from mellon.utils import get_idps
@@ -17,7 +19,7 @@ def login(request, *args, **kwargs):
         if 'next' not in request.GET:
             return HttpResponseRedirect(resolve_url('mellon_login'))
         return HttpResponseRedirect(
-            resolve_url('mellon_login') + '?next=' + urllib.quote(request.GET.get('next'))
+            resolve_url('mellon_login') + '?next=' + urllib.parse.quote(request.GET.get('next'))
         )
     return auth_views.LoginView.as_view(*args, **kwargs)(request)
 
diff --git a/docbow_project/docbow/forms.py b/docbow_project/docbow/forms.py
index c8f982b..0cee008 100644
--- a/docbow_project/docbow/forms.py
+++ b/docbow_project/docbow/forms.py
@@ -4,6 +4,7 @@ import datetime
 import hashlib
 import logging
 import collections
+import urllib.parse
 
 
 from django.forms import (
@@ -24,7 +25,6 @@ from django.conf import settings
 from django.db.models.query import Q
 from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm
 from django.utils.encoding import force_text
-from django.utils.six.moves import urllib
 
 from django_journal import journal as django_journal
 
diff --git a/docbow_project/docbow/models.py b/docbow_project/docbow/models.py
index c0f8f6f..0a47dfb 100644
--- a/docbow_project/docbow/models.py
+++ b/docbow_project/docbow/models.py
@@ -5,6 +5,7 @@ import random
 import hashlib
 import html
 import re
+import urllib.parse
 from collections import defaultdict
 import time
 
@@ -35,7 +36,6 @@ from django.utils.html import strip_tags
 from django.utils.timezone import now, utc
 from django.forms import ValidationError
 from django.utils.encoding import force_text
-from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.safestring import mark_safe
 
 from django_journal import journal as django_journal
@@ -434,7 +434,7 @@ class Document(Model):
         return " ".join([username(sender) for sender in self.extra_senders.all()])
 
     def url(self):
-        return urlparse.urljoin(
+        return urllib.parse.urljoin(
             app_settings.BASE_URL, reverse('inbox-message', kwargs=dict(mailbox_id=self.id))
         )
 
diff --git a/docbow_project/docbow/profile_views.py b/docbow_project/docbow/profile_views.py
index c5c0f0d..bdec36d 100644
--- a/docbow_project/docbow/profile_views.py
+++ b/docbow_project/docbow/profile_views.py
@@ -1,6 +1,7 @@
 from __future__ import print_function
+import urllib.parse
+
 from django.shortcuts import redirect
-from django.utils.six.moves import urllib
 from django.views.generic.edit import UpdateView, FormView
 from django.views.generic.base import TemplateResponseMixin, View
 from django.contrib import messages
diff --git a/docbow_project/docbow/sms_carrier_ovh.py b/docbow_project/docbow/sms_carrier_ovh.py
index a098707..8327369 100644
--- a/docbow_project/docbow/sms_carrier_ovh.py
+++ b/docbow_project/docbow/sms_carrier_ovh.py
@@ -2,7 +2,7 @@ import logging
 import json
 
 from django.utils.http import urlencode
-from django.utils.six.moves.urllib.request import urlopen
+from urllib.request import urlopen
 
 from django.conf import settings
 from django.utils.encoding import force_text
diff --git a/docbow_project/pfwb/management/commands/sendmail.py b/docbow_project/pfwb/management/commands/sendmail.py
index 4d9a9d4..5e07118 100644
--- a/docbow_project/pfwb/management/commands/sendmail.py
+++ b/docbow_project/pfwb/management/commands/sendmail.py
@@ -8,13 +8,13 @@ import email.header
 import logging
 import re
 import time
+from urllib.request import urlopen
 
 from django.conf import settings
 from django.core.management.base import BaseCommand
 import django.contrib.auth.models as auth_models
 from django.core.files.base import ContentFile
 from django.core.exceptions import MultipleObjectsReturned
-from django.utils.six.moves.urllib.request import urlopen
 from django.utils.timezone import utc, make_aware
 from django.utils.encoding import force_text
 from django.template.defaultfilters import slugify