diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-10-15 15:49:59 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-10-15 15:49:59 (GMT) |
| commit | bc2bfa6b68e138986e57e2925e5a31c0f17615ab (patch) | |
| tree | 9f4bf8db52f659c3abbe118935f0de7841ea98f9 /Lib | |
| parent | b6ca62acab791b2c8274277d12e747f9819df9be (diff) | |
| parent | b46fe797355d21fbf5c091abf25a0d9145976e5d (diff) | |
| download | cpython-bc2bfa6b68e138986e57e2925e5a31c0f17615ab.zip cpython-bc2bfa6b68e138986e57e2925e5a31c0f17615ab.tar.gz cpython-bc2bfa6b68e138986e57e2925e5a31c0f17615ab.tar.bz2 | |
Merge
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 0324afa..40d8d52 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -301,7 +301,7 @@ class _TestProcess(BaseTestCase): if hasattr(signal, 'alarm'): def handler(*args): - raise RuntimeError('join took too long: pid=%s' % p.pid) + raise RuntimeError('join took too long: %s' % p) old_handler = signal.signal(signal.SIGALRM, handler) try: signal.alarm(10) |