From f45f2e8b84cf5ba69f4b1762750200cc0f556e74 Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@gmail.com>
Date: Tue, 19 May 2009 17:32:06 +0700
Subject: [PATCH] test_socket.py: make 2.4 compatible

---
 greentest/test_socket.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/greentest/test_socket.py b/greentest/test_socket.py
index d818e8a..0cb8ba5 100644
--- a/greentest/test_socket.py
+++ b/greentest/test_socket.py
@@ -890,20 +890,21 @@ class TCPTimeoutTest(SocketTCPTest):
             raise Alarm
         old_alarm = signal.signal(signal.SIGALRM, alarm_handler)
         try:
-            signal.alarm(2)    # POSIX allows alarm to be up to 1 second early
             try:
-                foo = self.serv.accept()
-            except socket.timeout:
-                self.fail("caught timeout instead of Alarm")
+                signal.alarm(2)    # POSIX allows alarm to be up to 1 second early
+                try:
+                    foo = self.serv.accept()
+                except socket.timeout:
+                    self.fail("caught timeout instead of Alarm")
+                except Alarm:
+                    pass
+                except:
+                    self.fail("caught other exception instead of Alarm")
+                else:
+                    self.fail("nothing caught")
+                signal.alarm(0)         # shut off alarm
             except Alarm:
-                pass
-            except:
-                self.fail("caught other exception instead of Alarm")
-            else:
-                self.fail("nothing caught")
-            signal.alarm(0)         # shut off alarm
-        except Alarm:
-            self.fail("got Alarm in wrong place")
+                self.fail("got Alarm in wrong place")
         finally:
             # no alarm can be pending.  Safe to restore old handler.
             signal.signal(signal.SIGALRM, old_alarm)