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

[attributs] Assouplissement sur le formatage de certain attributs

Browse source
This commit is contained in:
Valentin Samir 2012-11-04 03:34:38 +01:00
parent a06b40b4e0
commit 5d9c732197
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
attributs.py
View file

@ -205,7 +205,7 @@ class yearAttr(intAttr):
def parse_value(self, val, ldif): def parse_value(self, val, ldif):
if int(val) < 1998 or int(val) > config.ann_scol: if int(val) < 1998 or int(val) > config.ann_scol:
raise ValueError("Année invalide (%s)" % val) raise ValueError("Annee invalide (%s)" % val)
self.value = int(val) self.value = int(val)
@ -471,11 +471,11 @@ class blacklist(Attr):
def parse_value(self, bl, ldif): def parse_value(self, bl, ldif):
bl_debut, bl_fin, bl_type, bl_comm = bl.split('$') bl_debut, bl_fin, bl_type, bl_comm = bl.split('$')
now = time.time() now = time.time()
self.value = { 'debut' : int (bl_debut), self.value = { 'debut' : bl_debut if bl_debut == '-' else int (bl_debut),
'fin' : bl_fin if bl_fin == '-' else int(bl_fin), 'fin' : bl_fin if bl_fin == '-' else int(bl_fin),
'type' : bl_type, 'type' : bl_type,
'comm' : bl_comm, 'comm' : bl_comm,
'actif' : int(bl_debut) < now and (bl_fin == '-' or int(bl_fin) > now) } 'actif' : (bl_debut == '-' or int(bl_debut) < now) and (bl_fin == '-' or int(bl_fin) > now) }
def is_actif(self): def is_actif(self):
return self.value['actif'] return self.value['actif']