From af9d15bcc6daeeb81331d40965cfe17dd48cd3ad Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Mon, 5 Oct 2015 00:28:20 +0200 Subject: [PATCH] fin_connexion: plus besoin de dateutil.parse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Car generalizedTimeFormat.value est un dt localisé now (lc_ldap) --- gestion/mail/fin_connexion.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gestion/mail/fin_connexion.py b/gestion/mail/fin_connexion.py index 46d06eec..8f5d5095 100755 --- a/gestion/mail/fin_connexion.py +++ b/gestion/mail/fin_connexion.py @@ -7,7 +7,6 @@ affluences en perm""" import sys import pytz import datetime -from dateutil.parser import parse as parse_gtf import calendar from lc_ldap.shortcuts import lc_ldap_readonly @@ -81,7 +80,7 @@ def warn(mail_conn, adh): 'adh': adh, } for l in fields: - fin = max(parse_gtf(v.value) for v in adh[l]) + fin = max(v.value for v in adh[l]) data[l] = fin deco = min(data[l] for l in fields) if deco >= PERIODE_TRANSITOIRE[0] and deco < PERIODE_TRANSITOIRE[1]: @@ -95,7 +94,7 @@ def compute_fin_connexion(adh): fields = ['finAdhesion'] if 'aid' in adh: fields.append('finConnexion') - value = min(max(parse_gtf(v.value) for v in adh[l]) for l in fields) + value = min(max(v.value for v in adh[l]) for l in fields) if value >= PERIODE_TRANSITOIRE[0] and value < PERIODE_TRANSITOIRE[1]: return PERIODE_TRANSITOIRE[1] return value @@ -148,7 +147,7 @@ def brief(c, debut, fin): if "--list" in sys.argv: for adh in to_warn: - valeurs = [max(parse_gtf(v.value) for v in adh[l]) \ + valeurs = [max(v.value for v in adh[l]) \ for l in ['finConnexion', 'finAdhesion'] ] [f_con, f_adh] = [coul(str(v), 'rouge' if v >= debut and v < fin else 'vert') \ for v in valeurs]