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

[richard.oudkerk]

http://hg.python.org/cpython/rev/71387075b6b1
changeset:   89935:71387075b6b1
parent:      89933:d308c20bf2f4
parent:      89934:bb6377db0a9e
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Sun Mar 23 18:53:53 2014 +0000
summary:
  Merge 3.4.

files:
  Lib/multiprocessing/spawn.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py
--- a/Lib/multiprocessing/spawn.py
+++ b/Lib/multiprocessing/spawn.py
@@ -80,8 +80,8 @@
     Returns prefix of command line used for spawning a child process
     '''
     if getattr(sys, 'frozen', False):
-        tmp = ' '.join('%s=%r' % item for item in kwds.items())
-        return [sys.executable, '--multiprocessing-fork'] + tmp
+        return ([sys.executable, '--multiprocessing-fork'] +
+                ['%s=%r' % item for item in kwds.items()])
     else:
         prog = 'from multiprocessing.spawn import spawn_main; spawn_main(%s)'
         prog %= ', '.join('%s=%r' % item for item in kwds.items())

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