Fix syntax error on Python 2.4

supervisor/poller.py

@@ -57,7 +57,7 @@ class SelectPoller(BasePoller):
                 self.writables,
                 [], timeout
                 )
-        except select.error as err:
+        except select.error, err:
             if err.args[0] == errno.EINTR:
                 self.options.logger.blather('EINTR encountered in poll')
                 return [], []
@@ -103,7 +103,7 @@ class PollPoller(BasePoller):
     def _poll_fds(self, timeout):
         try:
             return self._poller.poll(timeout * 1000)
-        except select.error as err:
+        except select.error, err:
             if err.args[0] == errno.EINTR:
                 self.options.logger.blather('EINTR encountered in poll')
                 return []
@@ -155,7 +155,7 @@ class KQueuePoller(BasePoller):
     def _kqueue_control(self, fd, kevent):
         try:
             self._kqueue.control([kevent], 0)
-        except OSError as error:
+        except OSError, error:
             if error.errno == errno.EBADF:
                 self.options.logger.blather('EBADF encountered in kqueue. '
                                             'Invalid file descriptor %s' % fd)
@@ -174,7 +174,7 @@ class KQueuePoller(BasePoller):
 
         try:
             kevents = self._kqueue.control(None, self.max_events, timeout)
-        except OSError as error:
+        except OSError, error:
             if error.errno == errno.EINTR:
                 self.options.logger.blather('EINTR encountered in poll')
                 return readables, writables

supervisor/tests/test_options.py

@@ -936,13 +936,14 @@ class ServerOptionsTests(unittest.TestCase):
 
         instance = self._makeOne()
         try:
-            instance.read_config(supervisord_conf)
-            self.fail("nothing raised")
-        except ValueError, exc:
-            self.assertTrue('contains parsing errors:' in exc.args[0])
-            self.assertTrue(malformed_file in exc.args[0])
-            msg = 'Included extra file "%s" during parsing' % malformed_file
-            self.assertTrue(msg in instance.parse_infos)
+            try:
+                instance.read_config(supervisord_conf)
+                self.fail("nothing raised")
+            except ValueError, exc:
+                self.assertTrue('contains parsing errors:' in exc.args[0])
+                self.assertTrue(malformed_file in exc.args[0])
+                msg = 'Included extra file "%s" during parsing' % malformed_file
+                self.assertTrue(msg in instance.parse_infos)
         finally:
             shutil.rmtree(dirname, ignore_errors=True)