diff options
author | Richard Oudkerk <shibturn@gmail.com> | 2014-03-23 18:53:53 (GMT) |
---|---|---|
committer | Richard Oudkerk <shibturn@gmail.com> | 2014-03-23 18:53:53 (GMT) |
commit | 91e7f04fc55523b339209dc6fb7702d3cf6bade4 (patch) | |
tree | d210f09b1159bfd6ccf12a4a7375db5c77277187 | |
parent | 2791e0d4e3e961faaa95b3167327b4706b00fdcc (diff) | |
parent | 99d8dd248923c64351da3c7f8fcc3c3d5b969cb8 (diff) | |
download | cpython-91e7f04fc55523b339209dc6fb7702d3cf6bade4.zip cpython-91e7f04fc55523b339209dc6fb7702d3cf6bade4.tar.gz cpython-91e7f04fc55523b339209dc6fb7702d3cf6bade4.tar.bz2 |
Merge 3.4.
-rw-r--r-- | Lib/multiprocessing/spawn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py index 8dc48dd..336e479 100644 --- a/Lib/multiprocessing/spawn.py +++ b/Lib/multiprocessing/spawn.py @@ -80,8 +80,8 @@ def get_command_line(**kwds): 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()) |