From c7aa435502ec219f8c30e1fcefd525586d1b6d62 Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Thu, 21 Aug 2008 21:17:34 +0200 Subject: [PATCH] make try-except-finally works with python 2.4 darcs-hash:20080821191734-86b55-88b99be3d4535aa935d28a4869d654401b9e0a23.gz --- src/jcl/jabber/component.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py index adced1c..bcfaa46 100644 --- a/src/jcl/jabber/component.py +++ b/src/jcl/jabber/component.py @@ -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)