crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[scripts] Going to utf-8

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-05-04 19:19:36 +02:00
parent c4a19a88ed
commit a1bf0a4547
54 changed files with 676 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gestion/ldap_crans.py
View file

@ -182,7 +182,7 @@ def preattr(val):
val = str(val).strip()
# On passe tout en utf-8 pour ne pas avoir de problèmes
# d'accents dans la base
return [len(val), unicode(val, 'iso-8859-1').encode('utf-8')]
return [len(val), val]
elif isinstance(val, unicode):
val = val.strip()
return [len(val), val.encode('utf-8')]
@ -690,8 +690,7 @@ class CransLdap:
closelog()
if type(expression) == str:
# Transformation de l'expression en utf-8
expression = unicode(expression, 'iso-8859-15').encode('utf-8')
pass
elif type(expression) == unicode:
expression = expression.encode('utf-8')
else:
@ -1889,7 +1888,7 @@ class BaseProprietaire(BaseClasseCrans):
if self.idn !='cid':
# Mail de bienvenue
self.services_to_restart('mail_bienvenue', [self.mail().encode('iso-8859-15')], start = time.time() + 660)
self.services_to_restart('mail_bienvenue', [self.mail().encode('utf-8')], start = time.time() + 660)
else:
ret += coul(u"Modification %s effectuée avec succès." % self.Nom(), 'vert')
@ -2178,7 +2177,7 @@ class Adherent(BaseProprietaire):
self.mail_invalide(False)
# on renvoie le mail de bienvenue
self.services_to_restart('mail_bienvenue', [new.encode('iso-8859-15')])
self.services_to_restart('mail_bienvenue', [new.encode('utf-8')])
return new
@ -2876,7 +2875,7 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
def __host_alias(self, champ, new):
""" Vérification de la validité d'un nom de machine """
# Supression des accents
new = strip_accents(unicode(new, 'iso-8859-15'))
new = strip_accents(unicode(new, 'utf-8'))
l, new = preattr(new)
new = new.lower()