[Python-checkins] r84558 - in python/branches/release27-maint: Lib/test/test_signal.py Modules/signalmodule.c

Mon Sep 6 18:17:50 CEST 2010

Author: brian.curtin
Date: Mon Sep 6 18:17:50 2010
New Revision: 84558
Log:
Merged revisions 84556 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r84556 | brian.curtin | 2010年09月06日 11:04:10 -0500 (2010年9月06日) | 7 lines
 
 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.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/test/test_signal.py
 python/branches/release27-maint/Modules/signalmodule.c
Modified: python/branches/release27-maint/Lib/test/test_signal.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_signal.py	(original)
+++ python/branches/release27-maint/Lib/test/test_signal.py	Mon Sep 6 18:17:50 2010
@@ -9,9 +9,8 @@
 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):
Modified: python/branches/release27-maint/Modules/signalmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/signalmodule.c	(original)
+++ python/branches/release27-maint/Modules/signalmodule.c	Mon Sep 6 18:17:50 2010
@@ -255,21 +255,20 @@
 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
