mirror of
https://github.com/python/cpython.git
synced 2025-08-22 17:55:18 +00:00
Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line #7092: Silence more py3k warnings. Patch by Florent Xicluna. ........ r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line #7092: silence some more py3k warnings. ........
This commit is contained in:
parent
5ff2745fed
commit
3efafd7749
41 changed files with 143 additions and 108 deletions
|
@ -14,7 +14,7 @@ process_pid = os.getpid()
|
|||
signalled_all=thread.allocate_lock()
|
||||
|
||||
|
||||
def registerSignals((for_usr1, for_usr2, for_alrm)):
|
||||
def registerSignals(for_usr1, for_usr2, for_alrm):
|
||||
usr1 = signal.signal(signal.SIGUSR1, for_usr1)
|
||||
usr2 = signal.signal(signal.SIGUSR2, for_usr2)
|
||||
alrm = signal.signal(signal.SIGALRM, for_alrm)
|
||||
|
@ -74,11 +74,11 @@ def test_main():
|
|||
signal.SIGUSR2 : {'tripped': 0, 'tripped_by': 0 },
|
||||
signal.SIGALRM : {'tripped': 0, 'tripped_by': 0 } }
|
||||
|
||||
oldsigs = registerSignals((handle_signals, handle_signals, handle_signals))
|
||||
oldsigs = registerSignals(handle_signals, handle_signals, handle_signals)
|
||||
try:
|
||||
run_unittest(ThreadSignals)
|
||||
finally:
|
||||
registerSignals(oldsigs)
|
||||
registerSignals(*oldsigs)
|
||||
|
||||
if __name__ == '__main__':
|
||||
test_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue