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

clubs: regex moins chiante sur les noms

Browse source
This commit is contained in:
Daniel STAN 2013-10-07 01:02:47 +02:00
parent 3cbbb2303f
commit f199947a5d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
attributs.py
View file

@ -363,7 +363,7 @@ class nom(Attr):
def parse_value(self, nom):
if self.parent != None:
if u'club' in [str(o) for o in self.parent['objectClass']]:
if u'club' in [o.value for o in self.parent['objectClass']]:
self.value = validate_name(nom,"0123456789\[\]")
else:
self.value = validate_name(nom)

2
crans_utils.py
View file

@ -206,7 +206,7 @@ def format_tel(tel):
def validate_name(value, more_chars=""):
"""Valide un nom: ie un unicode qui contient lettres, espaces et
apostrophes, et éventuellement des caractères additionnels"""
if re.match("^[A-Za-z0-9]([-' %s]?[A-Za-z0-9])*$" % more_chars,
if re.match("^[A-Za-z0-9]([-' %s]?[A-Za-z0-9]?)*$" % more_chars,
normalize('NFKD', value).encode('ASCII', 'ignore')):
return unicode(value)
else: