[Python-checkins] cpython (merge 3.3 -> default): Merge

[richard.oudkerk]

http://hg.python.org/cpython/rev/d8f2947262a6
changeset:   86380:d8f2947262a6
parent:      86378:484ce82b7873
parent:      86379:82aab9b1066d
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Tue Oct 15 16:49:59 2013 +0100
summary:
  Merge

files:
  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
--- 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)

-- 
Repository URL: http://hg.python.org/cpython