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

[attributs] on supprime les assert

Browse source
This commit is contained in:
Antoine Durand-Gasselin 2010-10-17 15:46:30 +02:00
parent 048bb919d9
commit 7c7dc93b87
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
attributs.py
View file

@ -267,19 +267,25 @@ class solde(Attr):
def parse_value(self, solde, ldif): def parse_value(self, solde, ldif):
# on évite les dépassements # on évite les dépassements
assert 0. >= float(solde) and float(solde) <= 1024. if float(solde) >= config.impression.decouvert and float(solde) <= 1024.:
raise ValueError("Solde invalide: %s" % solde)
self.value = solde self.value = solde
class host(Attr): class dnsAttr(Attr):
def parse_value(self, dns, ldif):
dns = dns.lower()
name, net = dns.split('.', 1)
if (net not in ['crans.org', 'wifi.crans.org'] or
not re.match('[a-z][-_a-z0-9]+', name)):
raise ValueError("Nom d'hote invalide '%s'" % dns)
self.value = dns
class host(dnsAttr):
singlevalue = True singlevalue = True
optional = False optional = False
hname = legend = u"Nom d'hôte" hname = legend = u"Nom d'hôte"
def parse_value(self, dns, ldif):
dns = dns.lower()
assert dns.endswith('.crans.org')
assert re.match('[a-z][-_a-z0-9]+', dns)
self.value = dns
class macAddress(Attr): class macAddress(Attr):
singlevalue = True singlevalue = True
@ -293,6 +299,7 @@ class macAddress(Attr):
def __unicode__(self): def __unicode__(self):
return unicode(self.value) return unicode(self.value)
class ipHostNumber(Attr): class ipHostNumber(Attr):
singlevalue = True singlevalue = True
optional = False optional = False
@ -307,6 +314,7 @@ class ipHostNumber(Attr):
def __unicode__(self): def __unicode__(self):
return unicode(self.value) return unicode(self.value)
class mid(Attr): class mid(Attr):
singlevalue = True singlevalue = True
optional = False optional = False
@ -318,16 +326,12 @@ class mid(Attr):
def __unicode__(self): def __unicode__(self):
return unicode(int(self.value)) return unicode(int(self.value))
class hostAlias(Attr):
class hostAlias(dnsAttr):
singlevalue = False singlevalue = False
optional = True optional = True
legend = u'Alias de nom de machine' legend = u'Alias de nom de machine'
def parse_value(self, dns, ldif):
dns = dns.lower()
assert dns.endswith('.crans.org')
assert re.match('[a-z][-_a-z0-9]+', dns)
self.value = dns
class ipsec(Attr): class ipsec(Attr):
singlevalue = False singlevalue = False