crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[firewall6] Mais tu m'_entend_ ? + problème de précédence

Browse source 
* list.entend -> list.extend
 * db.s -> db.search
 * % est prioritaire sur -, donc "%s" % ann_scol - 1 plante.
This commit is contained in:
Pierre-Elliott Bécue 2013-08-16 11:28:56 +02:00
parent 7433aaac2a
commit 1d15c0329d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gestion/ipt.py
View file

@ -749,9 +749,9 @@ def blacklist(ipt):
s = db.search('paiement=%s' % ann_scol) s = db.search('paiement=%s' % ann_scol)
if periode_transitoire: if periode_transitoire:
tmp=db.search('paiement=%s' % ann_scol-1) tmp=db.search('paiement=%s' % (ann_scol-1))
s['adherent'].entend(tmp['adherent']) s['adherent'].extend(tmp['adherent'])
s['club'].entend(tmp['club']) s['club'].extend(tmp['club'])
del tmp del tmp
for target in s['adherent'] + s['club']: for target in s['adherent'] + s['club']:
@ -761,7 +761,7 @@ def blacklist(ipt):
s = db.search('mblacklist=*&paiement=%s' % ann_scol) s = db.search('mblacklist=*&paiement=%s' % ann_scol)
if periode_transitoire: 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']: for target in s['machine']:
sanctions = target.blacklist_actif() sanctions = target.blacklist_actif()

4
gestion/ldap_crans.py
View file

@ -944,8 +944,8 @@ class CransLdap:
base = self.search('paiement=%s' % ann_scol) base = self.search('paiement=%s' % ann_scol)
base = base['adherent'] + base['club'] base = base['adherent'] + base['club']
if config.periode_transitoire: if config.periode_transitoire:
tmp=self.search('paiement=%s' % ann_scol-1) tmp=self.search('paiement=%s' % (ann_scol-1))
base.entend(tmp['adherent'] + tmp['club']) base.extend(tmp['adherent'] + tmp['club'])
del tmp del tmp
base=[a for a in base if a.paiement_ok()] base=[a for a in base if a.paiement_ok()]
if graphic: a = anim('\tTri des machines', len(base)) if graphic: a = anim('\tTri des machines', len(base))