diff --git a/attributs.py b/attributs.py index 9fca5c7..aeeee5b 100644 --- a/attributs.py +++ b/attributs.py @@ -50,12 +50,10 @@ from unicodedata import normalize from crans_utils import format_tel, format_mac, mailexist, validate_name, ip4_of_rid, ip6_of_mac import itertools -sys.path.append("/usr/scripts/") +sys.path.append("/usr/scripts") import cranslib.deprecated -sys.path.append("/usr/scripts/gestion") -import config -import config.impression -import annuaires_pg +from gestion import config +from gestion import annuaires_pg #: Serveur SMTP smtpserv = "smtp.crans.org" @@ -772,9 +770,15 @@ class macAddress(Attr): category = 'base_tech' can_modify = [parent, nounou, cableur] ldap_name = "macAddress" + default = u'' def parse_value(self, mac): - self.value = format_mac(mac) + mac = mac.lower() + if mac == macAddress.default: + self.value = mac + else: + self.value = format_mac(mac) + def __unicode__(self): return unicode(self.value).lower()