Python 2.4 compatibility

Author: A. Jesse Jiryu Davis

pymongo/connection.py

@@ -835,15 +835,18 @@ def __receive_data_on_socket(self, length, sock):
         while len(message) < length:
             try:
                 chunk = sock.recv(length - len(message))
-            except BaseException, e:
+            except:
+                # Store the exception from sock.recv() in case we throw a new
+                # exception in this exception-handler.
+                exc_type, exc_value, exc_traceback = sys.exc_info()
                 # PYTHON-294: must close socket here, because if it remains open
                 # after this then the next time we read from it we may get stale
                 # data from a previous operation.
                 try:
                     self.__pool.discard_socket()
                 except:
                     pass
-                raise e
+                raise exc_value
 
             if chunk == "":
                 raise ConnectionFailure("connection closed")

test/test_connection.py

@@ -16,6 +16,7 @@
 
 import datetime
 import os
+import signal
 import sys
 import time
 import unittest
@@ -481,38 +482,35 @@ def test_interrupt_signal(self):
         Test fix for PYTHON-294 -- make sure Connection closes its socket if it
         gets an interrupt while waiting to recv() from it.
         """
-        import pymongo
-        import signal
-
         c = get_connection()
         db = c.pymongo_test
 
-        # A $where clause which takes 1 sec to execute
+        # A $where clause which takes 1.5 sec to execute
         where = '''function() {
-            var d = new Date((new Date()).getTime() + 1*1000);
+            var d = new Date((new Date()).getTime() + 1.5 * 1000);
             while (d > (new Date())) { }; return true;
         }'''
 
         # Need exactly 1 document so find() will execute its $where clause once
         db.drop_collection('foo')
         db.foo.insert({'_id': 1}, safe=True)
 
-        # Convert SIGALRM to SIGINT -- it's hard to schedule a SIGINT for 1/2 a
+        # Convert SIGALRM to SIGINT -- it's hard to schedule a SIGINT for one
         # second in the future, but easy to schedule SIGALRM.
         def sigalarm(num, frame):
-            import sys
             raise KeyboardInterrupt
 
         old_signal_handler = signal.signal(signal.SIGALRM, sigalarm)
-        signal.setitimer(signal.ITIMER_REAL, 0.5, 0)
+        signal.alarm(1)
         raised = False
         try:
-            # Need list() to actually iterate the cursor and create the
-            # cursor on the server; find is lazily evaluated. The find() will
-            # be interrupted by sigalarm() raising a KeyboardInterrupt.
-            list(db.foo.find({'$where': where}))
-        except KeyboardInterrupt:
-            raised = True
+            try:
+                # Need list() to actually iterate the cursor and create the
+                # cursor on the server; find is lazily evaluated. The find() will
+                # be interrupted by sigalarm() raising a KeyboardInterrupt.
+                list(db.foo.find({'$where': where}))
+            except KeyboardInterrupt:
+                raised = True
         finally:
             signal.signal(signal.SIGALRM, old_signal_handler)
 
@@ -528,5 +526,7 @@ def sigalarm(num, frame):
             list(db.foo.find())
         )
 
+    # TODO: test raising an error in pool.discard_socket()
+
 if __name__ == "__main__":
     unittest.main()