From 6899ab97e8cec390d163c1eac47d56330e811573 Mon Sep 17 00:00:00 2001 From: Stephen Dranger Date: Fri, 18 Feb 2011 16:17:25 -0600 Subject: [PATCH] derp --- irc.pyc | Bin 14363 -> 14363 bytes memos.pyc | Bin 32049 -> 32143 bytes oyoyo/client.py | 4 ++++ oyoyo/client.pyc | Bin 10256 -> 10336 bytes 4 files changed, 4 insertions(+) diff --git a/irc.pyc b/irc.pyc index b8c874631144c89c1ae601466d7b50ae294999f1..e2a1cadc5a3dd2cc177958bb0080d0eabdab7170 100644 GIT binary patch delta 15 WcmbPTFuQ>5;wN6NYJ-hzq80!(2?eGA delta 15 WcmbPTFuQ>5;wN6N59%A)L@fX}ng$X8 diff --git a/memos.pyc b/memos.pyc index e68cd3877da0f543a7522c8f49de2d007d733077..9f5bc94659533977f47d962836fb2d06e9643dd4 100644 GIT binary patch delta 5085 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 delta 5059 zcma)93viUx72X??g(QSL$P>~m1`;<0qLP5b5`-iqBoLC^Bm#yeY<7RMOZE|V{{$F; z?AXzUQGE1Nl!_oqeWHk4A03@>w9!trjxs(vYOAPi)gtv#JGDA}obUXQ-C-DQX7ydj@;aPY-(j{($_YsNj+ZduqB%*w#{j_&`g`+KQr0p zNwWP|*>18TAc1!vJr7oqKjQ1SNZ8n>ae>M}~OkvPV z0d;^M(!v>KSqWn>>uJSkU21>7FX%J-``6M#GZw3rlv%zkU*y&1UNkj~Kd&3B3TY2G9;@1*~OoP65>jsHRtQmeHD=bTvThbG%v5 zBI}$ zcwLeHA!ED7$}=wQENoRb(Eh@8Sy#llOo^6ST3R$y-Ao-tO?kawLe*J2)n=tL(-&#- zg(KqqpV3!E>#P8YVeo@)6gNS~t+a1e%Un?A42D6&Y!15u0aqB2J4<(6dVG36waxx{ zjkpq-r!Qx4+Cfc*#l$eM-DE{)M`)~%rw;NjlEz?D(^ZkmP`PTYGn~*v-kmNgzjgRmv)6tc%%yaI4}HI#AML7t7sr zs-!UmwR0~mcIZ40Q`!xHzB6&U!=csD*yoORRa%2N2Vgn?qUJOPPV38Eey%qUxz4Lu z4CUM_Y_?HhRx_o`z=N!7AObgev}9H><}L;Jxj<@Xq%z6cy8J$m5q^|%N-s)}duS!K zmCm+rhICjOfs4s|=ve8$^Kl3h>A;J-!!GxbFF2?>X<}~a>_Ea)hilO2GL7NWrB7;J zuJTHPK*0;tJ@1yhVWtvVLoyF_*<=#EOiRm}(xLN=fA*AZEI-cU2+Ds( zrw^QU+zL^-8!EEZyEIg>NXE?9Vr2 zRCSWKvLs!SW*ky+}d?{5Si8a zY9C!!U8nAn-tO{v+KfnqGwch>uGy1y6N@Eum2nBrM>UxjJGn1?e@L)g9|b%jA-RFc zKhx$#PdNs_MDl22h-Z+7I}<{)fUaJ=AxmUnzSXTHI+c&`_@YEJ#Le-f75~c?*5=1p zetztymn=!k6RvnS3Z)X78hUTV&O%ryHi(Bzz7ki24VOMfW_={fz@+5tm7oUcpYXaVRDzTohPsXgF_>6(U4`vH(Q(H|Pd8YEx$Vk}MXHY`bJ;1GvG z!$uGxlthvYn9LM?Czc!nw9|pc<;9ZGIE>^Fc8!=}9fg3GzG-Z;KM3;f$qrFN*R6aj z9SaadTrOO5X>gwDGyTRvdbDYMRunUcMS@H!ve)Mh1rO22=8v+(wv!OCB12uPdemXM ze-+A@%g4Tl=Z+}ySJYUH6cp#fw6Dcf6Evf>K)pictrfGx{@ZyVsII2_I@^{{fbkm!GlPNqa+7bH;aTVNm|p!` z%)JPB32+=B84v{}dHe<~(hFw2hVkowHyILc-ErEX-O^>Aj{Qk@sI12z^f=%Nz?0P2 zJ*Ps7NDhpQ*Utgo0sN6c+!b~O2Ms+zd%6qiPGAOY*vbGgLvfs~zA26p-p3HRA5bhS zSVVs+e#0*B#~eLZDRm3oetG3s6awfPS^|wkwO*l;`g<`Hw@*4t{|-FyiumUQ56w)5 z&NaS>$=>64NsDO&B;fiE2!90-vnMTrFQQdUIq`CfpGDfeJK)jxfPEN% zinR*CAELqD>})(gOg@(_q9205-L$*6TP4Td?Om9pR#0}|#$`j`OLF)@eZU}^`RLZQ z(+l=$u;I&y5%kDYPtFsi2m7kBKExy%fopi!znx3%lfJpVbv)MffP4Uquv)rAUk>^= z@IC{a1b7&n5=)7fm?Kt~ATqyz$Q)4T(O`c>&8K(z4=jo@R{|b%asToR=m{`ji`#Fw z!q!!o$*U5sigJ2*Q@d)7{by74)O3`NTu7B63T!E&9`9WH66Wbz+T|Trr)a8gLCXcK z;IxqQGE9ooDnUtzu&MqMAYJ|yP=5y`0VMIGpvGyZuVhm^F%VVjn`hF=R#VTxIiJPs zxzYkzq;V+g^DbUV$(Xo|zV*#j9&&76tInt3=6Pe{Vz~|8gMb%s4TE)8xds}Lh&mSv zD=;TZOX*mEueBqjSGa+bB4=%8-liwaaYq-J(tJhda~S@b;Y^G>3+w65k!k8vx_`uUbpIdH zyGEy}FX<wwmjF% z^CTud1+)Xc0PF!=57-Yl3XnTqu6Jn%g>ap;pa^EmFsxvZXm@s*ZDD*G)`Q&yXaTGS zbV6Rdgxu8afDV}e^f1Ub+VJ)*W|wa;=<@4sMOo!_DUb5P>e$|Gk55s%sclDlon*%{ z=1La`4Qw{trbg40Zw)_RBLEYyi{9EXC+`N3#{f{SuL6YlJD`pZ&Pbt- io#jQjsWbD_^4p6XMVa}TnMwK0`BU@%YkT=%(*FQFLmQI- diff --git a/oyoyo/client.py b/oyoyo/client.py index e409117..d4486af 100644 --- a/oyoyo/client.py +++ b/oyoyo/client.py @@ -156,6 +156,7 @@ class IRCClient: self.socket.setblocking(0) #if self.timeout: # self.socket.settimeout(self.timeout) + self.socket.settimeout(10) helpers.nick(self, self.nick) helpers.user(self, self.nick, self.real_name) @@ -166,6 +167,9 @@ class IRCClient: while not self._end: try: buffer += self.socket.recv(1024) + except socket.timeout, e: + yield True + continue except socket.error, e: try: # a little dance of compatibility to get the errno errno = e.errno diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc index 48a8429a0296d7b62de5f2c742373bc426c626ae..be0ced5e8fb3948e1a0ea9176b685cfe6b7897bd 100644 GIT binary patch delta 937 zcmY*XOK1~O6uoyQlQh$O+9XZ$X+CXZ(?|tfs2hu7S_-Dtn3g2k57=hFDQ(&`Q#3F` z(SR!#!dnT7E<{|YAX&L|=|WHhu^a8em58D%!HxG$DdJ)d_nmv*ediwLPI0g3eD}+% zR!+QdJ`T9OCZIFCtjFFfuyQ~+pdhM})(8{3B14IlHyh@y}I z=C-yq;qEVstNjmiOGJQ2#ssEO#gN>CL5xZ&_DXJ)K}8v3#3<+zxk$s2C$YFOFr{$u zR(y>d$Gk{K=W(KAMx7GwigvuFOjGlt_!i&8Pn|adPANV^#LOtaT^eIJ!oaH11@S!@ z#Tnt3Pm8IP55IKEsYi%K@h5!^e{`CIEope1g%=qj_7wv9Q7Iim+oEs1SvoKLnQ5A` zkjcd=tSK^NS*Q>+*EDUjR1yy|Lw&PMaylz(x>h%8T63i|DL!Pfc!^A$QO;89x5yv5 z>);pdU6-jC5@RE&%sHy|eGhVF+nM9)G6P>NEmItmN`cDv;^oL3R)jAb#U(MCUFun6 VftSI@P$21q@Ou>TIeQeJ`~}lDyCnbs delta 837 zcmY*V-%C?*6hG(g-u<|`IdyYxZqC(oDn<1WLRijWM9yDLa}(1LH{yy-r#EtNN7P<> z5Y9u?TOd9OA^Q`06-u&~DDX9U2*N+0bFN4P_xs`V{hZJJp3ga_GrKd+<3C<~Verto z-{vYS0M#?3M%&^G(+!3PERc^$T>%tH|0hYI3F;0&Va>47dcpW!N5C>4(+hQg8p2M- zw)tRl2(cOg3+(Q z0}&0@6xdJ!D?bt0@d}}Q09Y{FsV5N6_@U^Or$y#4+|vjEM=H9Y=$4tdR#U;^hQW)R zvvM6<%0f*8vx8m+BBLQNI>B;*qg1Fprf(_Tj>_Hs^j&=+yI<_hvbbyWyj8L_+qGs4c$I*M5kR!SkzKI#y z3@>83aTInc_?5nN6}2oEPiQ!Lir*Tsm{aMRWMQgb`sJ<&Ton*kZi?>2!#GJTjuCnj z_u*+{KfZ@JP1(eA{MGoFs4AC7#W*9-Y5&4tdKe6|w8iJ?c5Z?mCnxxogXBO&2FXne zq{OH(Y_FF}o4E({J9#OX6H#YaT{lW)vsl_*&5coCZwd<>BCVylbVk(sR+WzStSd~q z$?A(I?=w5koe*ZnnH9DmkQP|sb==j)nSLTqY7XaVITgkw+DR?@ABn*$;1d{U>ln2( LYjmyuI_~`iCdsMw