entrouvert
/
passerelle-atreal-openads
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

use force_text() instead of unicode() (#39533)

This commit is contained in:
Emmanuel Cazenave 2020-02-04 17:09:09 +01:00
parent 671afb17ec
commit 090e4d2bc3
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
atreal_openads/models.py
View File

@ -35,6 +35,7 @@ from django.http import Http404
from django.utils.translation import ugettext_lazy as _
from django.core.files.base import ContentFile
from django.core.exceptions import ValidationError
from django.utils.encoding import force_text
from passerelle.base.models import BaseResource, HTTPResource
from passerelle.utils.api import endpoint
@ -127,8 +128,8 @@ class ForwardFile(models.Model, BaseModel): # pylint: disable=too-many-instance
return (u'ForwardFile(id=%s,connecteur=%s,collectivite=%s'
',demande=%s,dossier=%s,type=%s,filename=%s,status=%s)') % (
self.id, # pylint: disable=no-member
unicode(self.connecteur) if hasattr(self, 'connecteur') else None,
unicode(self.collectivite) if hasattr(self, 'collectivite') else None,
force_text(self.connecteur) if hasattr(self, 'connecteur') else None,
force_text(self.collectivite) if hasattr(self, 'collectivite') else None,
self.numero_demande, self.numero_dossier,
self.type_fichier, self.orig_filename, self.upload_status)
@ -240,8 +241,8 @@ class Collectivite(models.Model, BaseModel):
@force_encoded_string_output
def __repr__(self):
return u'Collectivite(id=%s,name=%s,connecteur=%s,openADS_id=%s,guichet=%s)' % (
self.id, unicode(self.name), # pylint: disable=no-member
unicode(self.connecteur) if hasattr(self, 'connecteur') else None,
self.id, force_text(self.name), # pylint: disable=no-member
force_text(self.connecteur) if hasattr(self, 'connecteur') else None,
self.openADS_id,
# pylint: disable=no-member
unicode(self.guichet) if hasattr(self, 'guichet') else None)
@ -311,15 +312,15 @@ class Guichet(models.Model, BaseModel):
def __repr__(self):
return u'Guichet(id=%s,collectivite=%s,%s)' % (
self.id, # pylint: disable=no-member
unicode(self.collectivite) if hasattr(self, 'collectivite') else None,
unicode(self))
force_text(self.collectivite) if hasattr(self, 'collectivite') else None,
force_text(self))
def __unicode__(self):
return u'%s %s -> %s %s [%s/%s]' % (
unicode(self.DAYS[self.ouverture_sem_d - 1][1]),
force_text(self.DAYS[self.ouverture_sem_d - 1][1]),
# pylint: disable=no-member
self.ouverture_sem_h.strftime('%H:%M') if self.ouverture_sem_h else None,
unicode(self.DAYS[self.fermeture_sem_d - 1][1]),
force_text(self.DAYS[self.fermeture_sem_d - 1][1]),
# pylint: disable=no-member
self.fermeture_sem_h.strftime('%H:%M') if self.fermeture_sem_h else None,
# pylint: disable=no-member
@ -397,8 +398,8 @@ class AtrealOpenads(BaseResource, HTTPResource, BaseModel):
def __repr__(self):
return u'AtrealOpenads(id=%s,openADS=%s,login=%s,collectivites=%s,default=%s)' % (
self.id, # pylint: disable=no-member
unicode(self.openADS_API_url),
unicode(self.basic_auth_username),
force_text(self.openADS_API_url),
force_text(self.basic_auth_username),
self.collectivites.count(), # pylint: disable=no-member
self.default_collectivite_openADS_id)

3
atreal_openads/utils.py
View File

@ -32,6 +32,7 @@ import sys
from HTMLParser import HTMLParser
from django.urls import reverse_lazy
from django.utils.encoding import force_text
def to_dash_case(camel_str):
@ -252,7 +253,7 @@ class BaseModel(object):
@force_encoded_string_output
def __str__(self):
return unicode(self)
return force_text(self)
# mainly for the view
def get_fields_kv(self):