diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 8e5a1925..fae06bed 100644 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -537,9 +537,13 @@ class CransLdap: serv_dn = 'cn=%s,%s' % (new, self.base_services) # Conversion avant stockage dans la base - if type(args) == str: args = [args] + if isinstance(args, basestring): + args = [args] args = map(lambda x:preattr(x)[1], args) - if type(start) == int: start = [start] + try: + start = [int(start)] + except TypeError: + pass start = map(lambda x:preattr(x)[1], start) if new in serv.keys(): @@ -1701,7 +1705,7 @@ class BaseProprietaire(BaseClasseCrans): if self.idn !='cid': # Mail de bienvenue - self.services_to_restart('mail_bienvenue', [self.mail().encode('iso-8859-15')], start = int(time.time()) + 600) + self.services_to_restart('mail_bienvenue', [self.mail().encode('iso-8859-15')], start = time.time() + 660) else: ret += coul(u"Modification %s effectuée avec succès." % self.Nom(), 'vert')