commit bc2bfa6b68e138986e57e2925e5a31c0f17615ab
author Richard Oudkerk <shibturn@gmail.com> Tue Oct 15 16:49:59 2013 +0100
committer Richard Oudkerk <shibturn@gmail.com> Tue Oct 15 16:49:59 2013 +0100
tree 9f4bf8db52f659c3abbe118935f0de7841ea98f9
parent b6ca62acab791b2c8274277d12e747f9819df9be
parent b46fe797355d21fbf5c091abf25a0d9145976e5d

Merge

Lib/test/_test_multiprocessing.py

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 @@
 
         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)