From 1d15c0329de95be34b4416132fb9d96eb774fe0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Fri, 16 Aug 2013 11:28:56 +0200 Subject: [PATCH] =?UTF-8?q?[firewall6]=20Mais=20tu=20m'=5Fentend=5F=C2=A0?= =?UTF-8?q?=3F=20+=20probl=C3=A8me=20de=20pr=C3=A9c=C3=A9dence?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * list.entend -> list.extend * db.s -> db.search * % est prioritaire sur -, donc "%s" % ann_scol - 1 plante. --- gestion/ipt.py | 8 ++++---- gestion/ldap_crans.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gestion/ipt.py b/gestion/ipt.py index 764a37f1..128cf470 100644 --- a/gestion/ipt.py +++ b/gestion/ipt.py @@ -749,9 +749,9 @@ def blacklist(ipt): s = db.search('paiement=%s' % ann_scol) if periode_transitoire: - tmp=db.search('paiement=%s' % ann_scol-1) - s['adherent'].entend(tmp['adherent']) - s['club'].entend(tmp['club']) + tmp=db.search('paiement=%s' % (ann_scol-1)) + s['adherent'].extend(tmp['adherent']) + s['club'].extend(tmp['club']) del tmp for target in s['adherent'] + s['club']: @@ -761,7 +761,7 @@ def blacklist(ipt): s = db.search('mblacklist=*&paiement=%s' % ann_scol) if periode_transitoire: - s['machine'].entend(db.s('mblacklist=*&paiement=%s' % ann_scol-1)['machine']) + s['machine'].extend(db.search('mblacklist=*&paiement=%s' % (ann_scol-1))['machine']) for target in s['machine']: sanctions = target.blacklist_actif() diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 97d41cce..958eb850 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -944,8 +944,8 @@ class CransLdap: base = self.search('paiement=%s' % ann_scol) base = base['adherent'] + base['club'] if config.periode_transitoire: - tmp=self.search('paiement=%s' % ann_scol-1) - base.entend(tmp['adherent'] + tmp['club']) + tmp=self.search('paiement=%s' % (ann_scol-1)) + base.extend(tmp['adherent'] + tmp['club']) del tmp base=[a for a in base if a.paiement_ok()] if graphic: a = anim('\tTri des machines', len(base))