From ffcdaf0551e1f9b18916ddf1ff949c90b68134d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Sat, 25 Apr 2015 18:08:59 +0200 Subject: [PATCH] Gestion de certaines erreurs --- printing/templates/templates.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/printing/templates/templates.py b/printing/templates/templates.py index 30b8252..713c47f 100644 --- a/printing/templates/templates.py +++ b/printing/templates/templates.py @@ -39,7 +39,10 @@ def prise_etat(chbre): return style(u"Aucune adresse connue", "violet") bat = chbre[0].lower() chbre = chbre[1:] - prise = gestion.annuaires_pg.chbre_prises(batiment=bat, chambre=chbre) + try: + prise = gestion.annuaires_pg.chbre_prises(batiment=bat, chambre=chbre) + except gestion.annuaires_pg.ChbreNotFound: + return style(u"Chambre inconnue", "violet") swid, port = int(prise[0]), int(prise[1:]) switch_name = "bat%s-%s.adm.crans.org" % (bat, swid) @@ -51,7 +54,10 @@ def prise_etat(chbre): lien = style(u"Prise %s%s virtuelle" % (bat, prise), "violet") return u", ".join([lien, cablage]) - switch = hptools2.HPSwitch(switch_name) + try: + switch = hptools2.HPSwitch(switch_name) + except hptools2.SwitchNotFound: + return style(u"Chambre inconnue", "violet") vlan_list = switch.get_vlans(port) vlans = u" " * (13 + len(chbre))