From c734b312cb8316af0c036323b16caf23545cd21f Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian.curtin@gmail.com>
Date: Mon, 6 Sep 2010 16:04:10 +0000
Subject: [PATCH] Clean up the fix to #9324 with some of the suggestions raised
 on python-dev in response to the original checkin.

Move the validation from the original loop into a switch statement,
and adjust a platform check in the tests.
---
 Lib/test/test_signal.py |  5 ++---
 Modules/signalmodule.c  | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index a00e2d86211..7aa03ef8920 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -9,9 +9,8 @@ import subprocess
 import traceback
 import sys, os, time, errno
 
-if sys.platform == 'os2' or sys.platform == 'riscos':
-    raise unittest.SkipTest("Can't test signal on %s" % \
-                                   sys.platform)
+if sys.platform in ('os2', 'riscos'):
+    raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
 
 
 class HandlerBCalled(Exception):
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index b5846fa0d76..8b60e41e807 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -255,21 +255,20 @@ signal_signal(PyObject *self, PyObject *args)
     int sig_num;
     PyObject *old_handler;
     void (*func)(int);
-#ifdef MS_WINDOWS
-    int cur_sig, num_valid_sigs = 6;
-    static int valid_sigs[] = {SIGABRT, SIGFPE, SIGILL, SIGINT,
-                               SIGSEGV, SIGTERM};
-    BOOL valid_sig = FALSE;
-#endif
     if (!PyArg_ParseTuple(args, "iO:signal", &sig_num, &obj))
         return NULL;
 #ifdef MS_WINDOWS
     /* Validate that sig_num is one of the allowable signals */
-    for (cur_sig = 0; cur_sig < num_valid_sigs; cur_sig++)
-        valid_sig |= (sig_num == valid_sigs[cur_sig]);
-    if (!valid_sig) {
-        PyErr_SetString(PyExc_ValueError, "signal number out of range");
-        return NULL;
+    switch (sig_num) {
+        case SIGABRT: break;
+        case SIGFPE: break;
+        case SIGILL: break;
+        case SIGINT: break;
+        case SIGSEGV: break;
+        case SIGTERM: break;
+        default:
+            PyErr_SetString(PyExc_ValueError, "invalid signal value");
+            return NULL;
     }
 #endif
 #ifdef WITH_THREAD