Projet

Général

Profil

0001-misc-remove-usage-of-six-module-64417.patch

Thomas Noël, 21 avril 2022 10:49

Télécharger (3,47 ko)

Voir les différences: 

Subject: [PATCH] misc: remove usage of "six" module (#64417)


 .../management/commands/notify_sectors.py                 | 8 ++++++--
 passerelle_montpellier_encombrants/models.py              | 5 -----
 2 files changed, 6 insertions(+), 7 deletions(-)
passerelle_montpellier_encombrants/management/commands/notify_sectors.py
2 2 

  		




  3
  3
  
    
import requests

  		




  4
  4
  
    
from datetime import datetime, timedelta

  		




  
  5
  
    
import urllib.parse

  		




  5
  6
  
    

  		




  6
  7
  
    
from django.conf import settings

  		




  7
  8
  
    
from django.core.management.base import BaseCommand, CommandError

  		




  8
  
  
    
from django.utils.six.moves.urllib import parse as urllib

  		




  9
  9
  
    

  		




  10
  10
  
    
from passerelle.base.signature import sign_url

  		




  11
  11
  
    
from passerelle_montpellier_encombrants.utils import email_sectors

  		




  ......




  21
  21
  
    
        if use_http_auth:

  		




  22
  22
  
    
            kwargs['auth'] = (settings.ENCOMBRANTS_API_HTTP_USERNAME, settings.ENCOMBRANTS_API_HTTP_PASSWORD)

  		




  23
  23
  
    
        elif sign:

  		




  24
  
  
    
            url = sign_url(url + '&email=' + urllib.quote(api_user), secret) + '&orig=' + urllib.quote(orig)

  		




  
  24
  
    
            url = (

  		




  
  25
  
    
                sign_url(url + '&email=' + urllib.parse.quote(api_user), secret)

  		




  
  26
  
    
                + '&orig='

  		




  
  27
  
    
                + urllib.parse.quote(orig)

  		




  
  28
  
    
            )

  		




  25
  29
  
    
        return requests.get(url, headers={'Accept': 'application/json'}, *kwargs)

  		




  26
  30
  
    

  		




  27
  31
  
    
    def handle(self, *args, **kwargs):

  		












  

    
      passerelle_montpellier_encombrants/models.py
    
  





  16
  16
  
    

  		




  17
  17
  
    
from django.urls import reverse

  		




  18
  18
  
    
from django.db import models

  		




  19
  
  
    
from django.utils import six

  		




  20
  19
  
    
from django.utils.translation import ugettext_lazy as _

  		




  21
  20
  
    

  		




  22
  21
  
    
from passerelle.base.models import BaseResource

  		




  ......




  44
  43
  
    
        return reverse('montpellier-encombrants-add')

  		




  45
  44
  
    

  		




  46
  45
  
    

  		




  47
  
  
    
@six.python_2_unicode_compatible

  		




  48
  46
  
    
class Sector(models.Model):

  		




  49
  47
  
    
    contact_email = models.CharField(

  		




  50
  48
  
    
        max_length=1024, blank=True, verbose_name=_('Contact Emails'), help_text=_('separated by commas')

  		




  ......




  60
  58
  
    
        return ', '.join([x.name for x in communes])

  		




  61
  59
  
    

  		




  62
  60
  
    

  		




  63
  
  
    
@six.python_2_unicode_compatible

  		




  64
  61
  
    
class Commune(models.Model):

  		




  65
  62
  
    
    name = models.CharField(max_length=50, blank=False, verbose_name=_('Name'))

  		




  66
  63
  
    
    insee = models.CharField(max_length=10, blank=False, verbose_name=_('INSEE Code'))

  		




  ......




  70
  67
  
    
        return u'%s (%s)' % (self.name, self.insee)

  		




  71
  68
  
    

  		




  72
  69
  
    

  		




  73
  
  
    
@six.python_2_unicode_compatible

  		




  74
  70
  
    
class Street(models.Model):

  		




  75
  71
  
    
    commune = models.ForeignKey(Commune, on_delete=models.CASCADE)

  		




  76
  72
  
    
    name = models.CharField(max_length=128, blank=False, verbose_name=_('Street'))

  		




  ......




  79
  75
  
    
        return '%s, %s' % (self.name, self.commune)

  		




  80
  76
  
    

  		




  81
  77
  
    

  		




  82
  
  
    
@six.python_2_unicode_compatible

  		




  83
  78
  
    
class CollectDay(models.Model):

  		




  84
  79
  
    
    sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)

  		




  85
  80
  
    
    date = models.DateField(verbose_name=_('Date'))

  		




  86
  
  
    
-