david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make try-except-finally works with python 2.4

Browse Source 
darcs-hash:20080821191734-86b55-88b99be3d4535aa935d28a4869d654401b9e0a23.gz
This commit is contained in:
David Rousselie
2008-08-21 21:17:34 +02:00
parent 48f562df6c
commit c7aa435502
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/jcl/jabber/component.py
View File

@@ -674,15 +674,16 @@ class JCLComponent(Component, object):
name="TimerThread")
timer_thread.start()
try:
while (self.running and self.stream
and not self.stream.eof
and self.stream.socket is not None):
self.stream.loop_iter(JCLComponent.timeout)
if self.queue.qsize():
raise self.queue.get(0)
except socket.error, e:
self.__logger.info("Connection failed, restarting.")
return (True, 5)
try:
while (self.running and self.stream
and not self.stream.eof
and self.stream.socket is not None):
self.stream.loop_iter(JCLComponent.timeout)
if self.queue.qsize():
raise self.queue.get(0)
except socket.error, e:
self.__logger.info("Connection failed, restarting.")
return (True, 5)
finally:
self.running = False
timer_thread.join(JCLComponent.timeout)