From f199947a5d4691a680b986f92e020fe562aecab1 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Mon, 7 Oct 2013 01:02:47 +0200
Subject: [PATCH] clubs: regex moins chiante sur les noms

---
 attributs.py   | 2 +-
 crans_utils.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attributs.py b/attributs.py
index f023bd1..6b9f74c 100644
--- a/attributs.py
+++ b/attributs.py
@@ -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)
diff --git a/crans_utils.py b/crans_utils.py
index b47f4d9..ec91028 100644
--- a/crans_utils.py
+++ b/crans_utils.py
@@ -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: