misc: remove usage of "six" module (#64417)

passerelle_montpellier_encombrants/management/commands/notify_sectors.py

@@ -2,10 +2,10 @@
 
 import requests
 from datetime import datetime, timedelta
+import urllib.parse
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from django.utils.six.moves.urllib import parse as urllib
 
 from passerelle.base.signature import sign_url
 from passerelle_montpellier_encombrants.utils import email_sectors
@@ -21,7 +21,11 @@ class Command(BaseCommand):
         if use_http_auth:
             kwargs['auth'] = (settings.ENCOMBRANTS_API_HTTP_USERNAME, settings.ENCOMBRANTS_API_HTTP_PASSWORD)
         elif sign:
-            url = sign_url(url + '&email=' + urllib.quote(api_user), secret) + '&orig=' + urllib.quote(orig)
+            url = (
+                sign_url(url + '&email=' + urllib.parse.quote(api_user), secret)
+                + '&orig='
+                + urllib.parse.quote(orig)
+            )
         return requests.get(url, headers={'Accept': 'application/json'}, *kwargs)
 
     def handle(self, *args, **kwargs):

passerelle_montpellier_encombrants/models.py

@@ -16,7 +16,6 @@
 
 from django.urls import reverse
 from django.db import models
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -44,7 +43,6 @@ class EncombrantsManagement(BaseResource):
         return reverse('montpellier-encombrants-add')
 
 
-@six.python_2_unicode_compatible
 class Sector(models.Model):
     contact_email = models.CharField(
         max_length=1024, blank=True, verbose_name=_('Contact Emails'), help_text=_('separated by commas')
@@ -60,7 +58,6 @@ class Sector(models.Model):
         return ', '.join([x.name for x in communes])
 
 
-@six.python_2_unicode_compatible
 class Commune(models.Model):
     name = models.CharField(max_length=50, blank=False, verbose_name=_('Name'))
     insee = models.CharField(max_length=10, blank=False, verbose_name=_('INSEE Code'))
@@ -70,7 +67,6 @@ class Commune(models.Model):
         return u'%s (%s)' % (self.name, self.insee)
 
 
-@six.python_2_unicode_compatible
 class Street(models.Model):
     commune = models.ForeignKey(Commune, on_delete=models.CASCADE)
     name = models.CharField(max_length=128, blank=False, verbose_name=_('Street'))
@@ -79,7 +75,6 @@ class Street(models.Model):
         return '%s, %s' % (self.name, self.commune)
 
 
-@six.python_2_unicode_compatible
 class CollectDay(models.Model):
     sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)
     date = models.DateField(verbose_name=_('Date'))