..

Author: daveads

core/process.py

@@ -2022,29 +2022,12 @@ def NumRunning(self):
 NO_ARG = -20
 
 
-_SIGNAL_MESSAGES = {
-    SIGSEGV: 'Segmentation fault',
-    SIGABRT: 'Aborted',
-    SIGILL: 'Illegal instruction',
-    SIGFPE: 'Floating point exception',
-    SIGBUS: 'Bus error',
-    SIGQUIT: 'Quit',
-    SIGTERM: 'Terminated',
-    SIGKILL: 'Killed',
-}
-
-
 def GetSignalMessage(sig_num):
     # type: (int) -> Optional[str]
-    """Get signal message from libc or fallback to hard-coded."""
-    msg = None  # type: Optional[str]
-    
+    """Get signal message from libc."""
     if mylib.PYTHON:
-        msg = libc.strsignal(sig_num)
-        if msg is not None:
-            return msg
-    
-    return _SIGNAL_MESSAGES.get(sig_num)
+        return libc.strsignal(sig_num)
+    return None
 
 
 class Waiter(object):

pyext/libc_test.py

@@ -12,6 +12,7 @@
 """
 import unittest
 import sys
+import signal
 
 import libc  # module under test
 
@@ -368,10 +369,10 @@ def testSleepUntilError(self):
     # Not testing errno case
 
   def testStrsignal(self):
-    self.assertEqual('Segmentation fault', libc.strsignal(11))
-    self.assertEqual('Aborted', libc.strsignal(6))
-    self.assertEqual('Illegal instruction', libc.strsignal(4))
-    self.assertEqual('Terminated', libc.strsignal(15))
+    self.assertEqual('Segmentation fault', libc.strsignal(signal.SIGSEGV))
+    self.assertEqual('Aborted', libc.strsignal(signal.SIGABRT))
+    self.assertEqual('Illegal instruction', libc.strsignal(signal.SIGILL))
+    self.assertEqual('Terminated', libc.strsignal(signal.SIGTERM))
 
     with self.assertRaises(ValueError):
       libc.strsignal(999)