wsproxy.py: python2.4 fixes.

utils/websocket.py

@@ -23,7 +23,7 @@ except:
 from urlparse import urlsplit
 from cgi import parse_qsl
 
-class WebSocketServer():
+class WebSocketServer(object):
     """
     WebSockets server class.
     Must be sub-classed with new_client method definition.
@@ -344,6 +344,7 @@ Connection: Upgrade\r
         signal.signal(signal.SIGINT, self.do_SIGINT)
 
         while True:
+            try:
                 try:
                     csock = startsock = None
                     pid = err = 0
@@ -359,10 +360,10 @@ Connection: Upgrade\r
                     except Exception, exc:
                         if hasattr(exc, 'errno'):
                             err = exc.errno
-                    elif type(exc) == select.error:
+                        else:
                             err = exc[0]
                         if err == errno.EINTR:
-                        self.vmsg("Ignoring interrupted syscall()")
+                            self.vmsg("Ignoring interrupted syscall")
                             continue
                         else:
                             raise
@@ -388,6 +389,7 @@ Connection: Upgrade\r
                     self.msg("handler exception: %s" % str(exc))
                     if self.verbose:
                         self.msg(traceback.format_exc())
+
             finally:
                 if csock and csock != startsock:
                     csock.close()