X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdakmultiprocessing.py;h=b709ecf558850f6f4ec2cf405e9e10b6a0c130cd;hb=391f5ec09a119131dc846b796ca791f4cecc69e4;hp=57152bf82d2e010d06bd92a0b07974e08b076611;hpb=3b8862ae0e21fae9fc552d4df160f45684976d7d;p=dak.git

diff --git a/daklib/dakmultiprocessing.py b/daklib/dakmultiprocessing.py
index 57152bf8..b709ecf5 100644
--- a/daklib/dakmultiprocessing.py
+++ b/daklib/dakmultiprocessing.py
@@ -26,7 +26,7 @@ multiprocessing for DAK
 ###############################################################################
 
 from multiprocessing.pool import Pool
-from signal import signal, SIGHUP, SIGTERM, SIGPIPE, SIGCHLD, SIGALRM
+from signal import signal, SIGHUP, SIGTERM, SIGPIPE, SIGALRM
 
 import sqlalchemy.orm.session
 
@@ -57,7 +57,6 @@ def _func_wrapper(func, *args, **kwds):
     signal(SIGHUP, signal_handler)
     signal(SIGTERM, signal_handler)
     signal(SIGPIPE, signal_handler)
-    signal(SIGCHLD, signal_handler)
     signal(SIGALRM, signal_handler)
 
     # We expect our callback function to return:
@@ -67,9 +66,9 @@ def _func_wrapper(func, *args, **kwds):
     #  messages is a string used for logging
     try:
         return (func(*args, **kwds))
-    except SignalException, e:
+    except SignalException as e:
         return (PROC_STATUS_SIGNALRAISED, e.signum)
-    except Exception, e:
+    except Exception as e:
         return (PROC_STATUS_EXCEPTION, str(e))
     finally:
         # Make sure connections are closed. We might die otherwise.