From 612891ba3e23a3ad00a7afa21539a1ea26209b71 Mon Sep 17 00:00:00 2001 From: Juhani Haverinen Date: Mon, 8 Jul 2013 20:53:12 +0300 Subject: [PATCH] Bugfixes for loading list of trusted nicks and auth systen --- botcmd.py | 7 ++++--- botcmd.pyc | Bin 5581 -> 5811 bytes 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/botcmd.py b/botcmd.py index 2680f05..1d3588b 100644 --- a/botcmd.py +++ b/botcmd.py @@ -25,7 +25,7 @@ msglock.release() def loadtrusted(): trustedlock.acquire() - trusted=[] + while len(trusted)>1: trusted.pop() #I'm really sorry but trusted=[] created trusted as local variable f=open('trusted.txt','r') for line in f: while len(line)>0 and line[-1]=='\n': line=line[:-1] @@ -106,7 +106,8 @@ def parse((line,irc)): for i in authcmds.pop(line[3][1:]): irc.send(i) else: - authcmds.pop(line[3][1:]) + if line[3][1:] in authcmds: + authcmds.pop(line[3][1:]) trustedlock.release() authcmdlock.release() elif line[1]=='482': @@ -126,7 +127,7 @@ def execcmd(cmdline): f.write('%s\t%s\t%s\n'%(receiver,sender,msg)) f.close() msglock.release() - if cmdline[0]=='/lt': + elif cmdline[0]=='/lt': loadtrusted() def help(cmd): diff --git a/botcmd.pyc b/botcmd.pyc index c418e4ecb5abc31269d26304a31176cb43976ed6..72cf4ee655c27e2d6f5a29974a51dff1f7397947 100644 GIT binary patch delta 2200 zcmY*Z&u<%55T3VQ|62b{R-SCaj3X(D-wSIw@RE42l!^}B(Cj!o|!j0Z|0lt&2Q(P zzCIrMJLP=*?;jskss9P%{~bJj>znacx}Hs|A*xuUiRwgqM3oS&Vzo&ts)xlAp&BgF z0ZU9Q@d1lNI!5&b`zxI!FHBy9_AIKTX!{4!DY|m|F;&vEeV%lNbei@QdC@Md+tm4) zb&sgv#c16+(x>3x{+7xEFNpsm_OEBji*uAukpB=>j!|Wp^bqMNtw*U7R;U6pEDOy8 zsZh_6K1O<&RxEy1b=!{!zcTWxkMwd!6{8|~4n0KK$4MXW=?T&Eg`4+^vwjbiZM&L8{bDqAl>c=46^;gY3>qHkKv4@Rk5s$x*B|txv zoQpbkp<5i>L)sSYD%!5njsm8)XxCy)gAnaVNnS`G`jl1A2Bcwu^gy42dwY(`1OB}p z%+L-_wEIz1dxr2U{K#f{cn@Z|Jmyc|;mc72q7*u~03n@oMR7R!LYm`>UR1UhMs@yMrIP@YO zAJ<}_6=*`gDF6Y9u1Bcz0Rx9anRFNU>Oh8tNf+2%77Kt7Kr-Lhh!{N}k02E^Is2s} zpq4j-wd!4ufpR$|m-k)fO~6Zk+jkiomys;8msH=Z0bDMjYF0wmOGQY277G{cs3g8A zDY(iZ<9HlAQtp;{9@l>J9^bkQacza(kF|V@z(-j3p+FU2c{JUHb8!+rg0eA~rnF zeL^mnF9416>q*U`yu>9H}&e`3WGmjw>qJ}cX6;hhjulzFoD^zHaV%REa= z#-&N`eRzGz{FSKWMgYFgU1+tMcUnPEE4ibloV}SR_l&>OHHbrl~Z|;B&D({ zZ#k-@#+1;6X~rxQn%Fo6#Ku4>U?TCz{_^Epf+>W?_ea$tpL*r?MHyA|6qt7UQum1b z&HIP3A`~sY%+2msy}Jw zvd5M4bTRuZq%zoB2%m!eD{~_^rzXsU-0AK#zb12nk9?o!htx5}c1f9;;R;)hl4qg_ zLwc;6V0E6CUKT9LqD~U0iG(U};iYKF1JQ2Sd GANn8t1$ndp delta 1999 zcmZ8h&u<%55T3VQuYbgL?8c7c^e1ge+%{=T5h{?NR&A70go4Y4jede;SYds-X>{;6MvqWH#6_OdEd;# z>7ULVO#GA2KKc8%H(Rvx$>R4izQO%34?Z(!8`LmJ5p{{Si5dx#Cdnj8i)4yqnq-D# zmgEr09LYSjv($h?f!cx^NpcWk(Z(1lljd#~sgWX;BxR9G(d=rM7TF=K-7=&Eb+dYx zA#KT#8tj?!q=u+l;ANqPN#egq+c;g3Htv%uBK_CYDAC4wQU^$tXj_mh(XvTC0!k!_ zYVrUr8&CCPa9{nI7XR=6n8UjxBu8j~Ebk?#QKm+P8l$Ajq%yReB7aV_iDg)3-Ce2H zt&*yc8l@$J4klR)Zw}NOh+jT991N4?`zR?TNRv9CV!Jj^l=D*mvYxVP>DQqaoT+t!Aj# zR+`Y<`L`Cs0zBIn{bs-8gleT3gvt*Su)WiskF)fBueID$E5R_VC%iza^=WTuDfIeI zEBanMJK)3em!q!Y8`yvlR1&%Xn@|j0OVohq2I~o}KToJFWLUViu~h4tw24Smm2)KH zA|kFXkanTYl?aCb&9$)8T9Lg=IG!#fjdGquUBn-F|B(fqWOnmdABwD;D*OI$M-|h40SMwV&9et4e0+_NGzp_GLCUpWh zow^77G4&B}EOV^6a zhm|x|Ogb74)3QbW1MR(QEAF$6z;9A#cwlbKQCN%`naROt=Av7H!d=Jv>_qAcW1EcL z#_i}eK3QF7NG3NE6r!`RBV?0hSZX`E!Ox5ShpEb$-1=VpDIGtZ+>Cw1>FAG4{qSOP z_vUf_EuBB5^KU(z%-%K9CW`#p8`l@2Z*xbZUviBycSOMD_dNHG2l7wZwdivG%300O zo^tIGEb7Nx3EDjn!OpRP6TuMJOj)}aeV3nli78{}8TgrF!mNd!*AMEv11L&#_Ph@5 zIj+(>IDX46MX5sHn!swX8EqBXofpLsQ8p^z$CN0Gq8Kx>kj7)KaL00kUSa>g0N}P1 zC@MMtBk2=8V&lG021z|;G2ONVZCoXlz;v6TErT{L5O_I!X}}XX=7D>AFPEir{i*d7 za;LTa0}or?E<-iE$hB8jpL&@4BCw1}US&@(u8Nj4--at1kh`k